Open
Conversation
Collaborator
Author
|
we need to enable mergify |
Add rules to ping authors on conflicts, manage the needs-rebase label, and automatically update PRs that fall behind main. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Sébastien Han <seb@redhat.com>
bdb03cc to
2be2c7d
Compare
Collaborator
franciscojavierarceo
left a comment
There was a problem hiding this comment.
I spent a little time with my clanker on this and here's a suggested setup:
pull_request_rules:
- name: add needs-rebase label on conflicts
conditions:
- conflict
- -closed
actions:
label:
add:
- needs-rebase
- name: remove needs-rebase label when conflict is resolved
conditions:
- -conflict
- -closed
actions:
label:
remove:
- needs-rebase
queue_rules:
- name: default
queue_conditions:
- base=main
- -draft
- -conflict
- "#approved-reviews-by>=1"
- check-success=ci
merge_conditions:
- check-success=ci
priority_rules:
- name: hotfix PRs go first
conditions:
- label=hotfix
priority: high
- name: high-priority PRs go ahead of normal PRs
conditions:
- label=high-priority
priority: mediumAnd I believe we can use @mergifyio queue and @mergifyio dequeue, and we can add the hotfix or high-priority label when appropriate.
This also reduces all of the noise IMO.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
.github/mergify.ymlwith rules for:needs-rebaselabelneeds-rebaselabel when conflict is resolvedTest Plan
Signed-off-by: Sébastien Han seb@redhat.com
Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com