Create conflicts.yml

Xlinka · Oct 17, 2023 · b27ac20 · b27ac20
1 parent 32dbebd
commit b27ac20
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
@@ -0,0 +1,16 @@
+name: 'Check for merge conflicts'
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@v2.0
+        with:
+          CONFLICT_LABEL_NAME: "Has Conflicts"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}