Git Branching Strategies
5 min read Quiz at the end
Git Flow (feature/develop/main), GitHub Flow (feature+main), and Trunk-Based Development.
Branching Strategies
Git Flow:
- main — production releases only
- develop — integration branch
- feature/* — one per feature
- release/* — release prep
- hotfix/* — emergency patches
GitHub Flow (simpler, recommended):
- main — always deployable
- feature-branches — short-lived, merged via PR
- Deploy immediately after merge to main
Trunk-Based Development:
- Everyone commits to main daily
- Use feature flags to hide incomplete work