Workflows
Conflict Governance for Long-lived Branches
Turn repeated long-branch conflicts from ad hoc firefighting into a managed process with sync cadence, hotspot tracking, and reusable conflict resolution.
- Teams turning commands into repeatable routines
- Readers who need sequencing, branch, and sync discipline
- Basic understanding of fetch, pull, push, and branches
- A sense of how and why branches diverge
- Copying a workflow without checking branch state
- Choosing the wrong integration path on shared branches
Why this deserves its own workflow
Long-lived branch syncs mainFrequent rebase produces same conflictsMultiple developers modify same area
Regular sync → fewer conflictsIdentify hotspots → prioritize architecture fixesrerere → auto-reuse resolutions
rerere (reuse recorded resolution) records conflict solutions and auto-applies them next time the same conflict occurs.
Long-lived branches do not just "have conflicts." They tend to produce recurring, predictable, high-cost conflict zones.
The real upgrade is moving from repeated firefighting to deliberate governance.
A steadier approach
- set a sync cadence
- identify conflict hotspots
- reuse repeated conflict resolutions where appropriate
- feed that knowledge back into branch and module boundaries
Common mistakes
- treating every conflict as a one-off event
- relying on one maintainer to carry all merge pain
- enabling reuse mechanisms but never validating the outcome