Skip to content

Commit 32961f6

Browse files
committed
docs: add instruction to create branch from next minor version branch
1 parent 0bd4119 commit 32961f6

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

contributing/workflow.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,20 @@ This local branch should be named appropriately, for instance
105105
"fix/problem123" or "new/mind-reader". The slashes in these branch names
106106
is optional, and implies a sort of namespacing if used.
107107

108-
For instance, make sure you are in the *develop* branch, and create a
109-
new feature branch, based on *develop*, for a new feature you are
108+
- All bug fix PRs should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
109+
- PRs with any enhancement should be sent to next minor version branch, e.g. __"4.3"__
110+
111+
For instance, if you send a PR to __"develop"__ branch, make sure you are in the *develop* branch, and create a
112+
new bugfix branch, based on *develop*, for a new feature you are
110113
creating:
111114

112115
git switch develop
116+
git switch -c fix/problem123
117+
118+
If you send a PR with an enhancement, make sure you are in the *next minor version* branch,
119+
and create a new feature branch, based on, e.g., *4.3*, for a new feature you are creating:
120+
121+
git switch 4.3
113122
git switch -c new/mind-reader
114123

115124
Saving changes only updates your local working area.

0 commit comments

Comments
 (0)