Skip to content

Clarify release merge strategy#4

Merged
rmorse merged 1 commit into
developfrom
docs/release-merge-strategy
Jun 13, 2026
Merged

Clarify release merge strategy#4
rmorse merged 1 commit into
developfrom
docs/release-merge-strategy

Conversation

@rmorse

@rmorse rmorse commented Jun 13, 2026

Copy link
Copy Markdown
Member

Summary

  • Clarify that short-lived work branches targeting develop can be squash-merged.
  • Clarify that release PRs and direct develop -> main promotion PRs should use a normal merge commit, not squash.
  • Explain why preserving ancestry matters for keeping main and develop easy to sync.

Verification

  • git diff --check

@rmorse rmorse merged commit 5c12427 into develop Jun 13, 2026
2 checks passed
@rmorse rmorse deleted the docs/release-merge-strategy branch June 13, 2026 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant