-
-
Save Freeaqingme/3724414 to your computer and use it in GitHub Desktop.
proposed workflow
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
We rename "master" to "develop" | |
We rename "release" to "master" | |
Thus "master" stays the default branch, which means most PRs will be made | |
against it. | |
Bugfixes are merged to: | |
- master | |
- develop | |
Features are merged to: | |
- develop | |
When develop looks like the next minor or major version: | |
- create new release branch, release/X.Y.0, from develop branch | |
- once stable, merge release/X.Y.0 to master, and delete release/X.Y.0 | |
- bugfixe branches merged to release/X.Y.0 are also merged to develop | |
To merge a bugfix: | |
git checkout -b hotfix/somename master | |
git pull .... | |
verify... | |
git checkout master | |
git merge --no-ff hotfix/somename | |
git checkout develop | |
git merge --no-ff hotfix/somename | |
To merge a feature: | |
git checkout -b feature/somename develop | |
git pull .... | |
verify .... | |
git checkout develop | |
git merge --no-ff feature/somename |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment