Skip to content

Commit aca6b8b

Browse files
authored
Merge pull request #520 from PHPCSStandards/feature/ghactions-mergeconflicts-check-v4-branch-too
GH Actions/merge conflicts: also check PRs for the 4.0 branch
2 parents a6b0baf + 1db4322 commit aca6b8b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.github/workflows/label-merge-conflicts.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
push:
66
branches:
77
- master
8+
- 4.0
89
# Check conflicts in new PRs and for resolved conflicts due to an open PR being updated.
910
pull_request_target:
1011
types:

0 commit comments

Comments
 (0)