Trunk-Based Development: A Source-Control Branching Model for Team Collaboration
By
handfuloflight
3mo ago· 5 min readen
100/100
Golden Brown
Bagelometer↗
Baker's choice. Dense with flavour, light on filler.
Score100Typehow-toSentimentpositive
Summary
Trunk-Based Development is a source-control branching model where developers collaborate on code in a single branch called 'trunk' (or 'main' in Git). The approach emphasizes avoiding long-lived development branches to prevent merge conflicts and maintain build stability. The article explains this methodology, particularly focusing on its application for smaller teams, and discusses various techniques, claims, and caveats associated with the practice.
Key quotes
· 5 pulledA 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
Shared branches off mainline/main/trunk are bad at any release cadence
Trunk-Based Development For Smaller Teams
A portal on this practice
