Long-Lived Branch Detox

How It Works

Long-lived branches increase divergence, which increases merge conflicts and surprises.

This recipe introduces controls to keep branches short-lived or safer when they can't be.

Triggers

• Feature branches run for weeks or months
• Merges become large, risky, and conflict-heavy
• "We'll integrate at the end" repeatedly fails

Steps

1. Measure branch age and divergence (commits behind main).
2. Enforce integration cadence: rebase/merge from main at least every N days.
3. Split work behind feature flags rather than branching by default.
4. Introduce "merge debt" tracking: high-divergence branches require a plan before continuing.
5. Require incremental PRs (small slices) instead of monolithic merges.

Expected Outcome

• Reduced merge conflict frequency and lower integration risk.
• More predictable delivery without late-stage integration disasters.

Example Inputs

• "We have a branch that's 600 commits behind main."
• "Integration is painful; conflicts destroy time."
• "We need to ship a big feature without freezing main."

Tips

• Integration debt behaves like technical debt: it compounds.