Git Workflows & Branching Strategies¶
Choosing the right Git workflow — trunk-based, Gitflow, or feature-branch — directly affects deployment velocity, merge conflict frequency, and team coordination. This topic covers the trade-offs between strategies and how to match your branching model to your release cadence.
Why this matters¶
The wrong branching strategy creates merge hell, slows releases, and breeds "integration day" dread. The right one makes CI/CD pipelines smooth and keeps the team moving. Understanding the trade-offs lets you make an informed choice rather than defaulting to whatever the last team used.
Contents¶
Start with the primer for the conceptual landscape, then apply techniques and learn the pitfalls.
| # | File | What it covers |
|---|---|---|
| 1 | Primer | Trunk-based vs Gitflow vs feature-branch, release trains, and when each fits |
| 2 | Street Ops | Rebase workflows, merge strategies, cherry-picking, and branch hygiene recipes |
| 3 | Footguns & Pitfalls | Force-push disasters, long-lived branches, and merge-conflict avalanches |