Monday, June 18, 2018

Git patterns and anti-patterns

Git patterns and anti-patterns for successful developers | Microsoft Build 2018 | Channel 9

Release Flow: How We Do Branching on the VSTS Team – Microsoft DevOps Blog

Illustration: prior branch strategy with multi-level team branches

Trunk Based Development

"A source-control branching model, where developers collaborate on code in a single branch called ‘trunk’ *, resist any pressure to create other long-lived development branches by employing documented techniques. They therefore avoid merge hell, do not break the build, and live happily ever after.
* trunk = master, in Git nomenclature"

Trunk-Based Development is not a new branching model. The word ‘trunk’ is referent to the concept of a growing tree, where the fattest and longest span is the trunk, not the branches that radiate from it and are of more limited length.

No comments: