From 46d99f7df61bae469777dcad4ce00efbc25754ee Mon Sep 17 00:00:00 2001
From: kumvijaya <kumvijaya@gmail.com>
Date: Sat, 27 Sep 2025 23:44:56 +0530
Subject: [PATCH] T7878: Using mergify rule to handle conflict checks for
 private repo

---
 .github/mergify.yml                      | 10 ++++++++++
 .github/workflows/check-pr-conflicts.yml |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 .github/mergify.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 00000000..985cf098
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,10 @@
+pull_request_rules:
+  - name: Label conflicting pull requests
+    description: Add a label to a pull request with conflict to spot it easily
+    conditions:
+      - conflict
+      - '-closed'
+    actions:
+      label:
+        toggle:
+          - conflict
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index f09e6641..9b0b9742 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -9,6 +9,7 @@ permissions:
   contents: read
 
 jobs:
-  check-pr-conflict-call:
+  check-pr-conflict:
+    if: github.repository_owner == 'vyos'
     uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current
     secrets: inherit