Everyone works on short-lived branches off main:
• Branches live <2 days
• Feature flags over long branches
• CI on every push
git switch -c feat/thing- Small changes
- Push → PR → squash merge
git switch main && git pull
Reduces merge conflicts dramatically.