summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorkumvijaya <kumvijaya@gmail.com>2025-10-09 23:37:47 +0530
committerkumvijaya <kumvijaya@gmail.com>2025-10-09 23:37:47 +0530
commit3becc6e764d357f81de7b27d95b1d6da6ca2b6fe (patch)
treed34ad9226033a703fa67edbd102ced7d07824cf4 /.github
parentc8759c0f89f36b9a4b603fb9587f9c2f6709edd6 (diff)
downloadvyos-1x-3becc6e764d357f81de7b27d95b1d6da6ca2b6fe.tar.gz
vyos-1x-3becc6e764d357f81de7b27d95b1d6da6ca2b6fe.zip
T7878: Using mergify rule to handle conflict checks for private repo
Diffstat (limited to '.github')
-rw-r--r--.github/mergify.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml
index 985cf0981..8733cfcad 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -7,4 +7,4 @@ pull_request_rules:
actions:
label:
toggle:
- - conflict
+ - conflicts