Branching
by
| | To branch or not to branch - it's not even a question.
Not branching prevents you taking risks, but branching isn’t free so there’s a tradeoff.
Strategy | What is it? | Advantages | Disadvantages |
Branch by abstraction (aka feature flags) | Have configuration turning your branch on and off dynamically at runtime. |
|
|
Feature Branches | A branch for a specific story/feature, reintegrated into trunk when it's 'done'. |
|
|
Merge Only Release Branch | No checkins to release branches are allowed. Everything change on a release branch must be merged in. |
|
http://nvie.com/posts/a-successful-git-branching-model/ |