소스 검색

release.sh: use merge-commit for release PRs to preserve release notes (#687)

* 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: trim rationale from release PR body
Jonas Björkert 1 주 전
부모
커밋
f5f2e47831
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      release.sh

+ 2 - 2
release.sh

@@ -168,7 +168,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 \
@@ -180,7 +180,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."
 
   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."