Skip to content

fix: disable rebase merge strategy org-wide #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcusburghardt merged 1 commit into from
Sep 4, 2026
+7 −2
Merged

fix: disable rebase merge strategy org-wide #211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions safe-settings/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,15 @@ repository:
# Currently only on complyctl; this enables it org-wide.
delete_branch_on_merge: true

# Merge strategies — all enabled org-wide, matching current state.
# Merge strategies.
# Squash and merge commit are enabled. Rebase merge is disabled
# because it rewrites commit SHAs (breaking Signed-off-by
# verification) and does not create a merge commit linking the
# PR to the branch history, making git log and git bisect
# harder to navigate. See STYLE_GUIDE.md § Pull Requests.
allow_squash_merge: true
allow_merge_commit: true
allow_rebase_merge: true
allow_rebase_merge: false

# Allow the "Update branch" button on PRs.
# Currently only on complyctl; this enables it org-wide.
Expand Down
Loading