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?
(2) What happens when someone checks in a hand-reconciled merge that is not a valid XML file, because whoops?