Skip to content

Commit 6ea8869

Browse files
committed
GH Actions/label mngmnt: add additional triggers for merge conflict check
... in an attempt to get the action runner to remove the "has conflict" label when a PR is updated (which hopefully would have resolved the conflict).
1 parent 0126667 commit 6ea8869

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
name: Check PRs for merge conflicts
22

33
on:
4+
# Check for new conflicts due to merges.
45
push:
56
branches:
67
- master
8+
# Check conflicts in new PRs and for resolved conflicts due to an open PR being updated.
9+
pull_request_target:
10+
types:
11+
- opened
12+
- edited
13+
- synchronize
14+
- reopened
715

816
# Cancels all previous workflow runs for the same branch that have not yet completed.
917
concurrency:

0 commit comments

Comments
 (0)