Merge pull request #10363 from pradyunsg/merge-conflict-autolabeling

pypa · Aug 15, 2021 · b538f56 · b538f56
2 parents f5c4a09 + eb700d7
commit b538f56
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/.github/workflows/label-merge-conflicts.yml b/.github/workflows/label-merge-conflicts.yml
@@ -0,0 +1,14 @@
+name: Autolabel merge conflicts
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  label-merge-conflicts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: pradyunsg/auto-label-merge-conflicts@v3
+        with:
+          CONFLICT_LABEL_NAME: "needs rebase or merge"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}