File tree Expand file tree Collapse file tree 3 files changed +33
-89
lines changed Expand file tree Collapse file tree 3 files changed +33
-89
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1+ name : Auto Comment Conflicts
2+ on :
3+ pull_request :
4+ branches :
5+ - ' develop'
6+ - ' 4.*'
7+ types :
8+ - labeled
9+
10+ concurrency :
11+ group : ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
12+ cancel-in-progress : true
13+
14+ jobs :
15+ auto-comment-conflict :
16+ permissions :
17+ contents : read
18+ pull-requests : write
19+ if : github.event.label.name == 'stale'
20+ runs-on : ubuntu-latest
21+ steps :
22+ - name : Add comment for PR with conflict
23+ uses : peter-evans/create-or-update-comment@v3
24+ with :
25+ token : ${{ secrets.GITHUB_TOKEN }}
26+ issue-number : ${{ github.event.pull_request.number }}
27+ body : |
28+ :wave: Hi, @${{ github.event.pull_request.user.login }}!
29+
30+ We detected conflicts in your PR against the base branch :speak_no_evil:
31+ You may want to sync :arrows_counterclockwise: your branch with upstream!
32+
33+ Ref: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments