]> git.ipfire.org Git - thirdparty/fastapi/sqlmodel.git/commitdiff
👷 Detect and label merge conflicts on PRs automatically (#1552)
authorSofie Van Landeghem <svlandeg@users.noreply.github.com>
Fri, 5 Sep 2025 08:33:55 +0000 (10:33 +0200)
committerGitHub <noreply@github.com>
Fri, 5 Sep 2025 08:33:55 +0000 (10:33 +0200)
.github/workflows/detect-conflicts.yml [new file with mode: 0644]

diff --git a/.github/workflows/detect-conflicts.yml b/.github/workflows/detect-conflicts.yml
new file mode 100644 (file)
index 0000000..aba329d
--- /dev/null
@@ -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."