Roadmap › Git & GitHub — Version Control from Basics to Advanced › Module: Working in a Team
Lessons in this course (10)
7. Branching strategies — GitFlow, GitHub Flow, trunk-based
IntermediateMediumLesson 7 of 10
| Strategy | Branches | Fits |
|---|---|---|
| GitFlow | main (releases), develop, feature/*, release/*, hotfix/* | Scheduled versioned releases (installed software, mobile) |
| GitHub Flow | main + short-lived feature branches, deploy after merge | Web apps with continuous delivery |
| Trunk-based | Everyone merges to main at least daily; feature flags hide unfinished work; release branches optional | High-performing CI/CD teams (DORA research) |
| Release branches | main + release/2026.10 cut for stabilisation | Enterprise apps with UAT cycles |
Hotfix in GitFlow: branch from main → fix → merge to main (tag) and develop.