What about a book in/book out file locking system? One would book a file out, locking it while you are working on it, then book it in again which unlocks it for use, or, in the spirit of "we are all adults here", flag the file as currently in-use and by whom. This would at least warn other peers from changing anything in the same file until you are done. I'm not talking full fledged Git here and I realise distributed file locking has its problems, but even a suitably watered down protocol would eliminate at least some (maybe a significant amount of?) possible conflicts. It would certainly provide a determined group of (business) users with a valuable tool to avoid conflicts altogether. And yes: conflict resolution would still be great for those cases which fell through the protocol cracks please.