File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change 2020 steps :
2121 - uses : prince-chrismc/label-merge-conflicts-action@v3
2222 with :
23- conflict_label_name : " stale"
23+ conflict_label_name : ' stale'
2424 github_token : ${{ github.token }}
2525
2626 # --- Optional Inputs ---
3030 # The optional `${author}` will be replaced with the username of the pull request
3131 conflict_comment : |
3232 :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!
33+
34+ 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!
3536
3637 Ref: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch
You can’t perform that action at this time.
0 commit comments