3 files changed, 12 insertions, 18 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 000000000..8733cfcad
--- /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:
+          - conflicts
diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml
deleted file mode 100644
index 52b11938e..000000000
--- a/.github/workflows/check-open-prs-conflict.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: "Open PRs Conflicts checker"
-on:
-  push:
-    branches:
-      - current
-      - sagitta
-      - circinus
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  check-pr-conflict-call:
-    uses: vyos/.github/.github/workflows/check-open-prs-conflict.yml@current
-    secrets: inherit
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index 5417fbb4a..5bf1c106e 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -8,7 +8,8 @@ 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