From 2d891e588002fd0dc296a62ac6e5a3a4de85f35a Mon Sep 17 00:00:00 2001 From: root Date: Sun, 1 Mar 2026 14:00:50 +0100 Subject: [PATCH] fix: switch to squash+merge for signed commit compatibility GitHub rebase merges cannot be signed (known limitation since 2022, no fix as of 2026). Switch to squash+merge commit to ensure all commits on protected branches are signed by GitHub web-flow key. - Enable allow_merge_commit and allow_squash_merge - Disable allow_rebase_merge - Disable required_linear_history (merge commits are non-linear) --- config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.yml b/config.yml index 3dcdd03..7d6b85b 100644 --- a/config.yml +++ b/config.yml @@ -13,9 +13,9 @@ allowed_command_users: # Target settings for repositories settings: merge: - allow_merge_commit: false - allow_squash_merge: false - allow_rebase_merge: true + allow_merge_commit: true + allow_squash_merge: true + allow_rebase_merge: false delete_branch_on_merge: true forks: @@ -32,7 +32,7 @@ branch_protection: contexts: [] enforce_admins: false required_pull_request_reviews: null - required_linear_history: true + required_linear_history: false required_conversation_resolution: false restrictions: null allow_force_pushes: false