docs: adopt dev/main branching model for public contributions - #17
Merged
Conversation
main is now protected and reserved for tagged releases; dev becomes the integration branch for day-to-day work and external contributions. Feature/fix branches are created from dev and PR'd into dev by default, with promotion to main a separate, explicit release step. Updates CLAUDE.md's Git & PR conventions, adds a Branching model section and updates Releasing/PR process in CONTRIBUTING.md, and logs the change in docs/PLAN.md § Deviations.
tyler-rich
added a commit
that referenced
this pull request
Jul 9, 2026
main is now protected and reserved for tagged releases; dev becomes the integration branch for day-to-day work and external contributions. Feature/fix branches are created from dev and PR'd into dev by default, with promotion to main a separate, explicit release step. Updates CLAUDE.md's Git & PR conventions, adds a Branching model section and updates Releasing/PR process in CONTRIBUTING.md, and logs the change in docs/PLAN.md § Deviations.
tyler-rich
added a commit
that referenced
this pull request
Jul 9, 2026
main is now protected and reserved for tagged releases; dev becomes the integration branch for day-to-day work and external contributions. Feature/fix branches are created from dev and PR'd into dev by default, with promotion to main a separate, explicit release step. Updates CLAUDE.md's Git & PR conventions, adds a Branching model section and updates Releasing/PR process in CONTRIBUTING.md, and logs the change in docs/PLAN.md § Deviations.
tyler-rich
added a commit
that referenced
this pull request
Jul 9, 2026
main is now protected and reserved for tagged releases; dev becomes the integration branch for day-to-day work and external contributions. Feature/fix branches are created from dev and PR'd into dev by default, with promotion to main a separate, explicit release step. Updates CLAUDE.md's Git & PR conventions, adds a Branching model section and updates Releasing/PR process in CONTRIBUTING.md, and logs the change in docs/PLAN.md § Deviations.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Scrye is moving toward accepting public/external contributions, so this switches the project to a
dev/mainbranching model:mainis now treated as protected, receiving only tagged releases (branch protection itself is configured separately in GitHub settings, not by this PR).devintegration branch has been cut frommainand pushed — it's the default branch for day-to-day work and external contributions.devand PR'd intodevby default. Promotion fromdevtomainis a separate, deliberate PR made only when explicitly cutting a release, followed by taggingmain.What changed
CLAUDE.md— § Git & PR conventions now describes thedev/mainmodel; all existing rules (git identity, no attribution footers, CI-green, deviations logging) are unchanged and now apply againstdevas the usual PR target.CONTRIBUTING.md— added a new § Branching model for external contributors, updated the branch-naming guidance and PR process to targetdev, and added a § Releasing section describing thedev→mainpromotion + tag flow.docs/PLAN.md— logged this workflow change in § Deviations.This PR itself is a process/docs change targeting
main(describing the new model), not a code contribution — per the new model, ordinary work will targetdevgoing forward.