Conflict handling

[tvogel]

I quite disagree with your decision on "true merges". The lack of sensible merges is what makes the use of Dropbox extremely cumbersome for larger groups. That is the place where a good distributed file system could really shine. And good merges in large groups is one of the things that makes git shine in the first place.

Don't get me wrong, I know what this means and that it is extremely hard to produce sensible merges for an abundance of data formats but a good framework should offer infrastructure for a sensible solution with "A or B" being only the last resort option.

Without that, any merge means manual intervention and many data-formats make it even difficult to spot the difference.