1 min lesson
Branching models on the integration-frequency axis
In "Branching models on the integration-frequency axis", answer "Why does trunk-based development make rollback cheaper than long-lived release branches?" Use one lesson detail to support it.
Step 1 of 3
Branching debates feel religious until you put them on one axis: how often does work integrate to the mainline? Review style, flag usage, release cadence all fall out of that one question. As a field engineer you have to argue both directions. The right answer is a function of the customer's risk tier and deploy capability, not your preference.
- Model
- Trunk-based + feature flags
- Integration frequency
- Continuous (hours)
- Isolation mechanism
- Runtime flags, not branches
- Best fit
- High deploy maturity, strong test gates, product velocity
- Model
- Short-lived feature branches
- Integration frequency
- Daily-ish (1–2 days)
- Isolation mechanism
- Tiny branch + PR
- Best fit
- Most teams; pragmatic default
- Model
- GitFlow / release branches
- Integration frequency
- Slow (weeks); merge windows
- Isolation mechanism
- Long-lived branches, cut points
- Best fit
- Regulated, versioned or on-prem shipped software
| Model | Integration frequency | Isolation mechanism | Best fit |
|---|---|---|---|
| Trunk-based + feature flags | Continuous (hours) | Runtime flags, not branches | High deploy maturity, strong test gates, product velocity |
| Short-lived feature branches | Daily-ish (1–2 days) | Tiny branch + PR | Most teams; pragmatic default |
| GitFlow / release branches | Slow (weeks); merge windows | Long-lived branches, cut points | Regulated, versioned or on-prem shipped software |