[anty]

I was hoping to read more about how merging of conflicts are done. The article tells us, that "users have an intuitive sense of human collaboration and avoid creating conflicts with their collaborators". Regarding non-clear merging, it states that it's still an open research question of how to let the application or the user with a view of the change history merge the conflicts.

How to merge conflicts is probably the most important part in a non-trivial app. Does anyone know of examples or research that has been done in this direction?

[tarruda]

I think the simplest strategy is to create "conflict documents" containing all conflicted data and present to the user for manual resolution.

This seems similar to what Evernote does

[OJFord]

Paper from the same (co-)author (Martin Kleppmann) is at: https://arxiv.org/pdf/1608.03960.pdf