Skip to content

fix(mergify): remove auto-update rule that adds merge commits#1070

Merged
mergify[bot] merged 1 commit intopython-wheel-build:mainfrom
LalatenduMohanty:fixing_mergify_extra_commits
Apr 17, 2026
Merged

fix(mergify): remove auto-update rule that adds merge commits#1070
mergify[bot] merged 1 commit intopython-wheel-build:mainfrom
LalatenduMohanty:fixing_mergify_extra_commits

Conversation

@LalatenduMohanty
Copy link
Copy Markdown
Member

The update action defaulted to merge, causing Mergify to add "Merge branch 'main' into " commits to PRs instead of rebasing them.

Closes: #1069

@LalatenduMohanty LalatenduMohanty requested a review from a team as a code owner April 17, 2026 13:13
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 17, 2026

📝 Walkthrough

Walkthrough

This change modifies the .mergify.yml configuration file to specify method: rebase for the "Auto-update approved PRs that are behind" rule. Previously, the update action had no explicit method specified, defaulting to merge behavior. The addition explicitly configures the Mergify bot to rebase PRs onto the main branch rather than creating merge commits.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 3 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Title check ⚠️ Warning The title states 'remove auto-update rule' but the actual change adds method: rebase to the existing rule—it modifies rather than removes it. Update title to reflect the actual change: 'fix(mergify): use rebase method for auto-update rule' or similar.
✅ Passed checks (3 passed)
Check name Status Explanation
Description check ✅ Passed Description explains the problem (default merge behavior) and references the linked issue, relating directly to the changeset.
Linked Issues check ✅ Passed The PR successfully implements the fix from issue #1069: adding method: rebase to the update action prevents merge commits.
Out of Scope Changes check ✅ Passed The changeset is focused solely on the Mergify configuration change required by issue #1069 with no extraneous modifications.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@mergify mergify bot added the mergify label Apr 17, 2026
The update action always creates merge commits when bringing PRs
up to date with main. The rebase action that previously handled
this correctly is deprecated for fork PRs after July 1, 2026.

Remove the auto-update rule entirely. Contributors can use the
existing conflict notification and manual @mergify rebase when
needed.

Closes: python-wheel-build#1069
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
@LalatenduMohanty LalatenduMohanty force-pushed the fixing_mergify_extra_commits branch from b78585b to 13826ee Compare April 17, 2026 13:26
@LalatenduMohanty LalatenduMohanty changed the title fix(mergify): use rebase method for auto-update rule fix(mergify): remove auto-update rule that adds merge commits Apr 17, 2026
Copy link
Copy Markdown
Contributor

@rd4398 rd4398 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@mergify mergify bot merged commit ae4b557 into python-wheel-build:main Apr 17, 2026
40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

fix(mergify): use rebase method for auto-update to avoid extra merge commits

2 participants