14 March
The merge bug was a policy bug
Nine days went into the transport layer. The transport layer was fine.
The conflict rule assumed last-write-wins on the whole document, so two people editing different paragraphs still produced a fight. The fix was four lines of policy and a test harness we should have written in week one.
I keep coming back to this because it is the same mistake in a new costume: we debug the thing that is loud instead of the thing that is wrong.