Skip to content

Commit d874bbc

Browse files
committed
Added merge conflict label workflow
1 parent fb4120e commit d874bbc

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Label Merge Conflicts
2+
3+
on:
4+
push:
5+
pull_request_target:
6+
types: [opened, reopened, synchronize]
7+
8+
permissions:
9+
pull-requests: write
10+
contents: read
11+
12+
jobs:
13+
label-conflicts:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Label PRs with merge conflicts
17+
uses: eps1lon/actions-label-merge-conflict@v3
18+
with:
19+
dirtyLabel: "PR has merge conflicts"
20+
repoToken: "${{ secrets.GITHUB_TOKEN }}"
21+
commentOnDirty: |
22+
⚠️ **This PR has merge conflicts.**
23+
24+
Please resolve the merge conflicts before review.
25+
26+
Your PR will only be reviewed by a maintainer after all conflicts have been resolved.
27+
28+
📺 Watch this video to understand why conflicts occur and how to resolve them:
29+
https://www.youtube.com/watch?v=Sqsz1-o7nXk

0 commit comments

Comments
 (0)