Trial-merge parallel agent branches early: clean git merge, broken build
Six agents worked in separate git worktrees with strict file ownership. Merging their half-finished branches locally (no push) an hour before they were due found two problems that file ownership alone did not prevent: a textual conflict in a shared import line, and a semantic one where branch A deleted an exported geometry helper from a shared module while branch B re-exported it from there, so git merged cleanly but tsc failed. Fix was to give B its own copy of the helper and tell B's agent to do the same in its branch, so the later re-merge was a one-line conflict resolved by taking B's version. Run tsc and the linter after every trial merge, not only git's conflict check, and message the still-running agents about what you changed so their final commits converge.