Skip to content

Clarify release merge strategy#5

Merged
rmorse merged 3 commits into
mainfrom
develop
Jun 13, 2026
Merged

Clarify release merge strategy#5
rmorse merged 3 commits into
mainfrom
develop

Conversation

@rmorse

@rmorse rmorse commented Jun 13, 2026

Copy link
Copy Markdown
Member

Summary

  • Promote the release merge-strategy clarification from develop to main.
  • Document that short-lived work branches targeting develop may be squash-merged.
  • Document that release PRs and direct develop -> main promotion PRs must use normal merge commits to preserve ancestry.

Verification

This PR should be merged with a normal merge commit, not squash.

rmorse added 3 commits June 13, 2026 13:30
Add the project contribution workflow, develop/main branch policy, CI path filtering for docs-only PRs, and macOS workflow concurrency.
Clarify that feature branches into develop may be squash-merged, while release and develop-to-main promotions should use normal merge commits.
@rmorse rmorse merged commit 7a70033 into main Jun 13, 2026
3 of 4 checks passed
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