Last Updated: November 21, 2025
Focus Areas
| Focus |
|---|
Trunk for continuous delivery, branches for experiments
|
Rebase or squash frequently to keep lists clean
|
Commands & Queries
git checkout trunk
Work on mainline
git checkout -b feature/login
Create a feature branch
git merge --ff-only trunk
Keep history linear
Summary
Pick a workflow that matches your release cadence and automate protections.
💡 Pro Tip:
Pair trunk commits with short-lived feature toggles and automated checks.