We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent c3ccb20 commit 664acebCopy full SHA for 664aceb
1 file changed
.github/label-conflict.yml
@@ -20,7 +20,7 @@ jobs:
20
steps:
21
- uses: prince-chrismc/label-merge-conflicts-action@v3
22
with:
23
- conflict_label_name: "stale"
+ conflict_label_name: 'stale'
24
github_token: ${{ github.token }}
25
26
# --- Optional Inputs ---
@@ -30,7 +30,8 @@ jobs:
30
# The optional `${author}` will be replaced with the username of the pull request
31
conflict_comment: |
32
:wave: Hi, @${author},
33
- We detected conflicts against the base branch :speak_no_evil:
34
- You'll want to sync :arrows_counterclockwise: your branch with upstream!
+
+ We detected conflicts in your PR against the base branch :speak_no_evil:
35
+ You may want to sync :arrows_counterclockwise: your branch with upstream!
36
37
Ref: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch
0 commit comments