Comment Re:GIT? (Score 1) 238
Yes, but my experience was that merge conflicts in Word docs were frequent and painful to resolve. So we introduced a 'lock before edit' convention for Word docs (and same could be said for any file not edited as text).
Merge conflicts in tables are bad enough, and that's fairly basic functionality. Good luck with merging changes to embedded media.