From 5ed03f3df4c06943b2c1f27b1740677372e68544 Mon Sep 17 00:00:00 2001 From: Marcus Burghardt Date: Thu, 3 Sep 2026 16:40:01 +0200 Subject: [PATCH] fix: disable rebase merge strategy org-wide 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 --- safe-settings/settings.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/safe-settings/settings.yml b/safe-settings/settings.yml index 2412f81..67e362f 100644 --- a/safe-settings/settings.yml +++ b/safe-settings/settings.yml @@ -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.