Automatic merge conflict labeling (#13162)

2026-08-21 11:07:12 +01:00 · 2020-03-21 15:35:42 -06:00
parent 5cb9535956
commit b87c287d1f
1 changed files with 13 additions and 0 deletions
@@ -0,0 +1,13 @@
+name: 'Merge Conflict Detection'
+on:
+  push:
+    branches:
+      - master
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: 'Merge Conflict'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}