Conflict resolution is a business decision, not a technical one
A delivery made offline at 14:02 arrives at 17:00, against a job the office reassigned at 14:30. Every obvious answer to who wins is wrong, and the right answer is not a technical one.
tail -f ~/notes
Writing
Concepts from the proof, explained in my own words with code from my own systems.
A merge is only safe when neither side is asserting a fact
I wrote the conflict resolver wrong the first time. Four tests went red in under a second and told me exactly what I had misunderstood.
The API was lying to me by being fine
Seven real defects found by running the system end to end rather than trusting six green test suites. The worst one reported success while writing nothing.