chore(mergify): Trigger automatic update rule for approved PRs #824
Conversation
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
dhellmann
reviewed
Oct 29, 2025
| - "-draft" | ||
| - "-conflict" | ||
| - "-closed" | ||
| - "#approved-reviews-by>=1" |
Member
There was a problem hiding this comment.
I think this rule is going to conflict with the one we have that causes MRs to merge when they are approved.
Member
Author
There was a problem hiding this comment.
@dhellmann Along with this change we need to do the following
If you want to force a specific update method, you need to configure it in your GitHub repository settings:
Go to: Repository Settings → General → Pull Requests
Look for: "Allow merge commits" / "Allow squash merging" / "Allow rebase merging"
Set your preferred default
Member
There was a problem hiding this comment.
Ok, but I don't think we want to rebase on merge. We want to force the tests to run against the code either merged against main or rebased against main.
Add a new Mergify rule to automatically rebase approved PRs when the base branch (main) is updated. This keeps PRs current with the latest code and ensures tests run on the actual merge result. The rebase happens automatically when: - PR is not a draft - PR has no merge conflicts - PR is still open - PR has at least 1 approval from maintainers Benefits: - Prevents stale PRs that fall behind main - Catches integration issues early - Ensures tests run on latest codebase - Maintains cleaner linear commit history The rebase rule is placed before the auto-merge rule to ensure PRs are up-to-date before automatic merging occurs. Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
LalatenduMohanty
force-pushed
the
force_rebase_prs
branch
from
365a92c to
98d1ec3
Compare
LalatenduMohanty
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Add a new Mergify rule to automatically rebase approved PRs when the base branch (main) is updated. This keeps PRs current with the latest code and ensures tests run on the actual merge result.
The rebase happens automatically when:
Benefits:
The rebase rule is placed before the auto-merge rule to ensure PRs are up-to-date before automatic merging occurs.