IT:AD:Git:HowTo:Branch
- See:
Summary
There are two primary flows: * IT:AD:GitFlow * GitHub Flow
Git Flow
- Advantages:
- Suited for a concept of releases (eg: traditional enterprise release cadence)
- Considerations:
- Involves the development quite a few well known branches:
master
,develop
,features
,hotfix
,release
- All developers treat
develop
as the source for theirfeatures
, which are merged back todevelop
. - When a set of
features
are considered stable,develop
is branched to afeature
. - Testing takes place on the
feature
branch. - Fix bugs in the
feature
branch. - Then merge those changes to
develop
, then tomaster
, where you tag it to match the feature branch name.
- Disadvantages:
- Should not start developing till you've created a
develop
branch.