Skip to content

Commit e307c0f

Browse files
ci(mergify): only report conflicts on draft PRs with a milestone
This is an evolution of the idea in #3614 that should be closer to what we want. Not sure why I didn't think of this in the first place. Pull-Request: #3660.
1 parent 83c2aca commit e307c0f

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

.github/mergify.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ pull_request_rules:
1414
conditions:
1515
- conflict
1616
- -author=dependabot[bot]
17+
- or:
18+
- -draft # Don't report conflicts on regular draft.
19+
- and: # Do report conflicts on draft that are scheduled for the next major release.
20+
- draft
21+
- milestone~=v[0-9]\.[0-9]{2}
1722
actions:
1823
comment:
1924
message: This pull request has merge conflicts. Could you please resolve them @{{author}}? 🙏

0 commit comments

Comments
 (0)