Last active
May 21, 2017 14:20
-
-
Save aliuosio/468de55842aa3b7d68f020e4d5bef6fd to your computer and use it in GitHub Desktop.
Summarized list of the key features of git flow branching
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
| Feature branches | |
| - based on develop by default | |
| (base can be changed through second parameter) | |
| - merged into develop | |
| - tag is not set | |
| - local branch is deleted | |
| Bugfix branches | |
| - based on develop | |
| (base can be changed through second parameter) | |
| - merged into develop and master | |
| - tag is not set | |
| - local branch is deleted | |
| Release branches | |
| - based on develop | |
| (base can be changed through second parameter) | |
| - merged into develop and master | |
| - tag is set | |
| - local branch is deleted | |
| Hotfix branches | |
| - based on master | |
| (base can be changed through second parameter) | |
| - merged into develop and master | |
| - tag is not set | |
| - local branch is deleted | |
| - only one hot fix branch is a allowed | |
| Support branches | |
| - base branch must be set by user | |
| - can’t be finished by git flow | |
| - you have to merge using usual git commands |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment