fix: disable rebase merge strategy org-wide - #211
Open
marcusburghardt wants to merge 1 commit into
Open
Conversation
Rebase merge rewrites commit SHAs, which breaks Signed-off-by trailer verification, and does not create a merge commit linking the individual commits to the originating PR. This makes git log and git bisect harder to navigate compared to merge commits. Squash merge and merge commit remain enabled: - Merge commit: preserves individual PR commits and creates a clear link to the PR in git history. - Squash merge: useful for single-commit or trivial PRs. Assisted-by: OpenCode (claude-opus-4-6) Signed-off-by: Marcus Burghardt <maburgha@redhat.com>
marcusburghardt
requested review from
gxmiranda,
jflowers and
jpower432
as code owners
September 3, 2026 14:42
marcusburghardt
enabled auto-merge (rebase)
September 3, 2026 14:43
Contributor
|
Even though this PR is straightforward and the content LGTM, I would like to check @jflowers and @jpower432 opinions on the decision introduced by the PR as well. |
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
3 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.
Summary
Disable the rebase merge strategy across all managed repositories via safe-settings.
Rationale
Rebase merge has two drawbacks compared to merge commit and squash:
Breaks
Signed-off-byverification -- rebase merge replays commits withnew SHAs, invalidating the original signatures.
No PR linkage in git history -- unlike merge commit (
Merge pull request #N)or squash (PR # in commit message), rebase merge creates no connection between
the commits and the originating PR in
git log. The link is only visible inthe GitHub UI.
The remaining strategies cover all use cases:
Evidence
Audit of recent merge activity across code repos:
Reference: STYLE_GUIDE.md § Pull Requests