Skip to content

Commit 15787fd

Browse files
authored
GH: auto label conflict PR
1 parent cc28c41 commit 15787fd

1 file changed

Lines changed: 38 additions & 0 deletions

File tree

.github/label-conflict.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Auto Label Conflicts
2+
on:
3+
push:
4+
branches:
5+
- 'develop'
6+
- '4.*'
7+
pull_request:
8+
branches:
9+
- 'develop'
10+
- '4.*'
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
14+
cancel-in-progress: true
15+
16+
permissions:
17+
contents: read
18+
19+
jobs:
20+
auto-label:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: prince-chrismc/label-merge-conflicts-action@v3
24+
with:
25+
conflict_label_name: "stale"
26+
github_token: ${{ github.token }}
27+
28+
# --- Optional Inputs ---
29+
# To make sure the merge commit exactly matches the branch
30+
detect_merge_changes: true # or true to handle as conflicts
31+
# By default a comment will be left, adding `conflict_comment: ''` will disable comments
32+
# The optional `${author}` will be replaced with the username of the pull request
33+
conflict_comment: |
34+
:wave: Hi, @${author},
35+
We detected conflicts against the base branch :speak_no_evil:
36+
You'll want to sync :arrows_counterclockwise: your branch with upstream!
37+
38+
Ref: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch

0 commit comments

Comments
 (0)