> If the state was concurrently changed on different devices, Automerge automatically merges the changes together cleanly, so that everybody ends up in the same state, and no changes are lost.
> Different from git: no merge conflicts to resolve!
This is impossible unless there are significant restrictions on what kind of operations are possible.
If I have a bag of 15 apples, and I take 10 of those apples at the same time as somebody else takes more than five apples then we have a merge conflict right there because we can't end up with a negative amount of apples in the bag.
> Different from git: no merge conflicts to resolve!
This is impossible unless there are significant restrictions on what kind of operations are possible.
If I have a bag of 15 apples, and I take 10 of those apples at the same time as somebody else takes more than five apples then we have a merge conflict right there because we can't end up with a negative amount of apples in the bag.