Branching strategies
Learning objectives: compare Git branching models, choose the right one for the release cadence, and keep branches short-lived to reduce conflicts.
Overview
How teams structure branches so the main line stays healthy and features flow to release predictably — the strategic layer above raw Git mechanics.
Concepts introduced (link to term notes)
Units
- Trunk-based development
- GitFlow (feature/release/hotfix branches)
- Choosing a strategy for your release cadence
Key terms & commands
trunk/main · feature branch · release/* · hotfix/* · fast-forward · merge · rebase
Hands-on
Create short-lived branches off main, merge frequently, and observe that conflicts grow as branches age.
Exam focus
Trunk-based ↔ continuous delivery; GitFlow ↔ planned versioned releases; short branches = fewer merge conflicts.
Related
Path MOC · get-started-with-git · pull-requests-and-code-review