Skip to content

Commit

Permalink
GH Actions/merge conflicts: also check PRs for the 4.0 branch
Browse files Browse the repository at this point in the history
Based on the logging, the PRs for the 4.0 branch are not checked on pushes. Let's enable that.
  • Loading branch information
jrfnl committed Jun 5, 2024
1 parent a6b0baf commit 1db4322
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/label-merge-conflicts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 1db4322

Please sign in to comment.