Skip to content

Commit

Permalink
ci(mergify): only report conflicts on draft PRs with a milestone
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
thomaseizinger committed Mar 22, 2023
1 parent 83c2aca commit e307c0f
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ pull_request_rules:
conditions:
- conflict
- -author=dependabot[bot]
- or:
- -draft # Don't report conflicts on regular draft.
- and: # Do report conflicts on draft that are scheduled for the next major release.
- draft
- milestone~=v[0-9]\.[0-9]{2}
actions:
comment:
message: This pull request has merge conflicts. Could you please resolve them @{{author}}? 🙏
Expand Down

0 comments on commit e307c0f

Please sign in to comment.