From 04cf0340234c19518516d5b41dca99a1e747f27c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bj=C3=B6rkert?= <jonas@bjorkert.se>
Date: Sun, 21 Jun 2026 23:29:20 +0200
Subject: [PATCH] release.sh: use merge-commit for release PRs to preserve
 notes

The PR-based flow recommended rebase-merge, which rewrites the feature-PR commits to new SHAs on main. That breaks GitHub's auto-generated release notes (only the release author is credited, no PR list) and diverges main from dev. Switch the guidance to 'Create a merge commit' so main retains the original commits and the release notes generate correctly.
---
 release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.sh b/release.sh
index 3ba67c2fb..c3b208e12 100755
--- a/release.sh
+++ b/release.sh
@@ -146,7 +146,7 @@ if [[ $confirm =~ ^[Yy]$ ]]; then
 
 \`auto_version_dev\` detects that \`Config.xcconfig\` was changed in this push and skips re-bumping.
 
-⚠️ **Use rebase-merge** (not squash or merge-commit) so \`dev\` and \`main\` end up at the same commit SHA after the release."
+⚠️ **Use \"Create a merge commit\"** (not squash or rebase) so \`dev\` and \`main\` share the same release lineage."
 
   echo; echo "📝  Opening release PR ${RELEASE_BRANCH} → ${MAIN_BRANCH} …"
   gh pr create \
@@ -157,7 +157,7 @@ if [[ $confirm =~ ^[Yy]$ ]]; then
 
 Merging this PR triggers the tagging workflow, which creates tag \`v${new_ver}\` from \`LOOP_FOLLOW_MARKETING_VERSION\` in \`Config.xcconfig\`.
 
-⚠️ **Use rebase-merge** (not squash or merge-commit) so \`dev\` and \`main\` end up at the same commit SHA after the release."
+⚠️ **Use \"Create a merge commit\"** (not squash or rebase) so \`main\` keeps the original feature-PR commits. Rebase rewrites them to new SHAs, which breaks GitHub's auto-generated release notes (no PR list, only the release author is credited) and diverges \`main\` from \`dev\`."
 
   echo; echo "🎉  All repos updated to v${new_ver} (local). Release PRs opened (sync → dev, release → main)."
   echo "👉  Review and merge both PRs — the tag will be created automatically by .github/workflows/tag_on_main.yml."