[heikkitoivonen]

Ok, so you haven't automated merge conflict resolution.

There are also cryptographically signed documents which you cannot merge, because that would break signatures.

So the question is, how much automated merge processing should be done, and how big are the risks in doing so. Even if the system were capable of doing merges for some documents, it would need to have a setting to turn it off. Recovering erroneously merged documents also needs some thinking. And so forth.

So bottom line is I guess we agree that in some cases merges can be done, automated to some level even, but there is a lot of work needed to make it safe, understandable and usable for the majority of users.