Hacker News new | past | comments | ask | show | jobs | submit login

The description contradicts itself:

> Different from git: no merge conflicts to resolve!

But later:

> The only case Automerge cannot handle automatically, because there is no well-defined resolution, is when users concurrently update the same property in the same object (or, similarly, the same index in the same list). In this case, Automerge arbitrarily picks one of the concurrently written values as the "winner":


> Although only one of the concurrently written values shows up in the object, the other values are not lost. They are merely relegated to a _conflicts object


>git merge --strategy-option=theirs

Guidelines | FAQ | Support | API | Security | Lists | Bookmarklet | Legal | Apply to YC | Contact