A real walkthrough of a binary file conflict, the shortcuts that look tempting, and the one fix that actually works
