Long-lived feature branches feel safe, but they silently tank flow: stale code, surprise conflicts, runaway rebase sessions, and lead times no stakeholder can predict. That’s the problem Mark Seemann’s advice exposes: big batches create significant pain. When integration is a “phase,” delivery becomes episodic, risky, and political. Work piles up, feedback arrives late, and teams confuse busyness with progress.
Reduce batch size and integrate continuously. Ship in small steps guarded by feature flags (dark launches, toggles, kill switches). Trunk-based development lowers WIP, shortens feedback loops, and turns scary releases into boring ones. Flags decouple deploy from release, let you test in prod safely, and create fast rollback paths. Technically, this nudges the architecture toward a seam-friendly design: ports/adapters, contract tests, idempotent migrations, and telemetry indicating whether the slice is healthy.
Could you set explicit flow policies?
1) “No branch lives > 48h” and cap concurrent work, WIP limits per person and per team.
2) Mandate a flag taxonomy (release, ops, experiment) with owners, default-off, and sunset rules.
3) CI/CD gates: every commit builds, tests, security scans, and deploys to a staging env; trunk stays releasable.
4) Observability as a safety net, SLOs, canaries, and error budgets drive go/no-go.
5) Workforce practices that reinforce small steps: pair/mob blocks, definition of done that includes flag removal, and code review SLAs (<24h). Measure with DORA metrics + flow metrics (lead time, deployment frequency, change failure rate, aging WIP).
Pick one value stream and run.
1) Branch audit and “merge-hell burn-down.”
2) Introduce flags on the next feature, slice by slice; daily flow review replaces status theater.
3) Automate the pipeline and publish a flow dashboard.
4) Scale policies org-wide, retire old toggles, and celebrate boring releases.
Your job? Be the blocker-bulldozer and the storyteller, explain the “why,” remove friction, and let the system learn faster than it breaks.