Even git isn't perfect. I spend plenty of time in a three windowed merge tool figuring out which piece of code should go where when we have merge conflicts. Th

Even git isn't perfect. I spend plenty of time in a three windowed merge tool figuring out which piece of code should go where when we have merge conflicts. The solution would have to be to store everything in ascii formats (probably taking a hit in terms of filesize and performance) and get everyone to understand the ascii representation each of these data formats and how to merge them effectively. The alternative would be to build a diff tool for every binary based format out there. The simplest solution would simply be to implement locking on everything and have one authoritative copy. So you can have your data on any device you want and share it with as many others as you want but only one person/device can have write access at any given time and can only have that once they have updated to the latest version of that rescource.