.docx is plain text xml though (You can even save explicitly as .xml which has all the images in base64).
Is track changes not good enough?
Is track changes not good enough?
(2) What happens when someone checks in a hand-reconciled merge that is not a valid XML file, because whoops?