From 3b1b70cf1191c573f6fa0f6e49b74ee57378fa76 Mon Sep 17 00:00:00 2001
From: Sofie Van Landeghem <svlandeg@users.noreply.github.com>
Date: Fri, 5 Sep 2025 10:33:55 +0200
Subject: [PATCH] =?utf8?q?=F0=9F=91=B7=20Detect=20and=20label=20merge=20co?=
 =?utf8?q?nflicts=20on=20PRs=20automatically=20(#1552)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/detect-conflicts.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/detect-conflicts.yml

diff --git a/.github/workflows/detect-conflicts.yml b/.github/workflows/detect-conflicts.yml
new file mode 100644
index 00000000..aba329db
--- /dev/null
+++ b/.github/workflows/detect-conflicts.yml
@@ -0,0 +1,19 @@
+name: "Conflict detector"
+on:
+  push:
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  main:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if PRs have merge conflicts
+        uses: eps1lon/actions-label-merge-conflict@v3
+        with:
+          dirtyLabel: "conflicts"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has a merge conflict that needs to be resolved."
-- 
2.47.3