File tree Expand file tree Collapse file tree 1 file changed +29
-0
lines changed
Expand file tree Collapse file tree 1 file changed +29
-0
lines changed Original file line number Diff line number Diff line change 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
You can’t perform that action at this time.
0 commit comments