Trunk based development (Concept)
March 27, 2025 ยท View on GitHub
Description
Prevent merge-conflict hassles with trunk-based development practices.
Tags
capability, technical, core
Documentation
There are two main patterns for developer teams to work together using version control. One is to use feature branches, where either a developer or a group of developers create a branch usually from trunk (also known as main or mainline) and then work in isolation on that branch until the feature they are building is complete. When the team considers the feature ready to go, they merge the feature branch back to trunk.
The second pattern is known as trunk-based development, where each developer divides their own work into small batches and merges that work into trunk at least once (and potentially several times) a day. The key difference between these approaches is scope. Feature branches typically involve multiple developers and take days or even weeks of work. In contrast, branches in trunk-based development typically last no more than a few hours, with many developers merging their individual changes into trunk frequently.
Other Relations
| From | Name | To | Description |
|---|---|---|---|
| Trunk based development | enables | Fast Flow |
Navigation
(generated by Overarch with template docs/node.md.cmb)