Skip to content

Commit b538f56

Browse files
authored
Merge pull request #10363 from pradyunsg/merge-conflict-autolabeling
2 parents f5c4a09 + eb700d7 commit b538f56

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Autolabel merge conflicts
2+
3+
on:
4+
push:
5+
branches: [main]
6+
7+
jobs:
8+
label-merge-conflicts:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: pradyunsg/auto-label-merge-conflicts@v3
12+
with:
13+
CONFLICT_LABEL_NAME: "needs rebase or merge"
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)