File tree Expand file tree Collapse file tree 1 file changed +15
-0
lines changed
Expand file tree Collapse file tree 1 file changed +15
-0
lines changed Original file line number Diff line number Diff line change @@ -81,6 +81,21 @@ Use GitHub issue templates in `.github/ISSUE_TEMPLATE/`. Blank issues disabled.
8181
8282Add ` Priority: ` and ` Effort: ` labels manually per issue. No emoji/icons in titles. Concise text, no time estimates.
8383
84+ ## Branching
85+
86+ ```
87+ main ← stable, tagged releases only; never commit directly
88+ release-X.Y.0 ← integration branch per milestone; PRs merge here
89+ feature/issue-N-desc ← short-lived; cut from the active release branch
90+ ```
91+
92+ - ** Feature branches** cut from the active ` release-X.Y.0 ` (matches issue milestone)
93+ - ** PRs** target ` release-X.Y.0 ` , never ` main `
94+ - ** ` main ` ** updated only when releasing — merge ` release-X.Y.0 ` → ` main ` via a release PR, then tag
95+ - ** Hotfixes** branch off ` main ` , PR back to both ` main ` and the active release branch
96+ - Create ` release-X.Y.0 ` at milestone start; delete after merge to ` main `
97+ - Active release branch is the one matching the current in-progress milestone
98+
8499## Pull Requests
85100
86101Template at ` .github/PULL_REQUEST_TEMPLATE.md ` . Two sections:
You can’t perform that action at this time.
0 commit comments