From ecbe4d7d2d495d25fe40f8544f847208eb2ee9d2 Mon Sep 17 00:00:00 2001 From: Chris Bargmann Date: Thu, 30 Jul 2026 16:02:39 +0200 Subject: [PATCH] ci(repo-settings): use squash-merge only for clean release-please changelogs --- common.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index 19ac135..a38cca1 100644 --- a/common.mk +++ b/common.mk @@ -111,9 +111,11 @@ repo-settings: ## Reconcile GitHub repository settings (labels, merge strategy, \ echo " Configuring merge strategy..."; \ $(GH) api "repos/$$REPO" -X PATCH \ - -f allow_merge_commit=true \ - -f allow_squash_merge=false \ + -f allow_merge_commit=false \ + -f allow_squash_merge=true \ -f allow_rebase_merge=false \ + -f squash_merge_commit_title=PR_TITLE \ + -f squash_merge_commit_message=PR_BODY \ -f delete_branch_on_merge=true \ -f allow_auto_merge=true > /dev/null; \ \