Trunk-based development without the 2 a.m. pages
Long-lived branches feel safe and merge badly. Trunk-based development with flags gets you small merges and safe releases — if you separate deploying from releasing.

The reason teams keep long-lived feature branches is fear: unfinished work in main might reach users. Feature flags remove the reason. Code can be deployed without being released.
Deploy is a technical event. Release is a business decision. Stop letting the first make the second.
The workflow
- Branches live for hours, not weeks. Merge to main at least daily.
- Unfinished work merges behind a flag that defaults to
false. - Main deploys on every merge. Nobody waits for a release train.
- Release is flipping the flag: first to your team, then 1%, then everyone.
What changes on call
Most 2 a.m. pages are a recent release misbehaving. When every release is a flag, the first response is a toggle, not a revert-and-redeploy. The investigation can wait until morning.
Setting this up takes an afternoon. The quickstart walks through the first flag in about ten minutes.

Written by
Jordan Hale
Co-founder & CTO
Jordan co-founded Driftwire after one too many Friday rollbacks. Writes about release engineering, trunk-based development and paying down flag debt.
More posts by Jordan Hale
