Merge pull request #520 from PHPCSStandards/feature/ghactions-mergeco…

…nflicts-check-v4-branch-too GH Actions/merge conflicts: also check PRs for the 4.0 branch
PHPCSStandards · Jun 5, 2024 · aca6b8b · aca6b8b
2 parents a6b0baf + 1db4322
commit aca6b8b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/label-merge-conflicts.yml b/.github/workflows/label-merge-conflicts.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+      - 4.0
   # Check conflicts in new PRs and for resolved conflicts due to an open PR being updated.
   pull_request_target:
     types: