From: Sofie Van Landeghem <svlandeg@users.noreply.github.com>
Date: Fri, 5 Sep 2025 08:33:55 +0000 (+0200)
Subject: 👷 Detect and label merge conflicts on PRs automatically (#1552)
X-Git-Tag: 0.0.25~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b1b70cf1191c573f6fa0f6e49b74ee57378fa76;p=thirdparty%2Ffastapi%2Fsqlmodel.git

👷 Detect and label merge conflicts on PRs automatically (#1552)
---

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."