“Recurring merge conflicts are the canary telling you that there is a misalignment between a) the work you do, and b) the type of work your architecture supports.”

— Adam Tornhill, CodeScene

Quote · adamtornhill.substack.com

From “Why Merge Conflicts became the new Agentic Bottleneck”, found 2026-10-14.

Take

He argues stacked PRs and smarter queues patch symptoms. His fix is to find hotspots and change coupling, then split them along domain boundaries so parallel tasks land in different places.