https://tokenise.rosvetic.com/tags/merge/Recent content in Merge on TokeniseHugoen-gbTue, 27 Oct 2026 07:07:00 +0000https://tokenise.rosvetic.com/posts/merge-dry-run-parallel-agent-branches/Tue, 27 Oct 2026 07:07:00 +0000https://tokenise.rosvetic.com/posts/merge-dry-run-parallel-agent-branches/<p>Four worktree sessions finish within a few minutes of each other. Each reports success, each has a green test run, and each left a branch behind. Now the real work starts. Merge them in the wrong order and the second merge stops on a conflict in a file the third branch also rewrote. Merge them in a lucky order and everything lands cleanly, then the test suite fails on code nobody wrote: two agents each did something sensible in isolation, and the sum doesn&rsquo;t compile.</p>