Git Branching Strategies Cheat Sheet

Last Updated: November 21, 2025

Model Comparison

Model	Characteristics
`GitHub flow`	Main + feature branches, deploy from main
`GitLab flow`	Environment branches + release tracking
`Trunk-based`	Short-lived feature toggles, commit to trunk daily


         git checkout -b feature/xyz

Start new branch


         git fetch && git rebase origin/main

Stay current


         git merge --no-ff feature/xyz

Preserve history

Require CI checks, squash merges when needed, and document release branching rules.

💡 Pro Tip: Short-lived branches + enforced PR reviews reduce merge headaches.