This is a draft cheat sheet. It is a work in progress and is not finished yet.
Branch Categories
develop |
default branch for developers |
master |
published, tagged releases only |
feature/ITS-123 |
Feature or Topic branches, groups linked commits during development |
release/1.2
release/1.2.3 |
Major/Minor Release branches for Fixes after CodeFreeze. Branched from dev (major) or other release (minor). |
hotfix/1.2.3.1 |
Hotfix-Release branch on demand from master at tag v1.2.3 |
Feature (aka Topic or Bugfix)
show local feature branches |
|
start new feature 'ITS-123' from dev |
git flow feature start ITS-123
|
push incomplete feature-branch
(rarely used) |
|
rebase feature
pull changes from dev |
|
finish feature
merge to dev |
|
After starting feature, all feature-actions are started from within feature-branch.
|
|
Release - git flow release ...
Show local release branches |
|
Start new major release 1 |
|
Start minor 1.2 based on rel. 1 |
|
Push snapshot (tagged?) |
|
Finish release |
|
|
