Skip to content

Create new documents to demostrate conflict resolution #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivanreese merged 1 commit into from
Dec 12, 2025
Merged

Create new documents to demostrate conflict resolution #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions content/docs/reference/documents/conflicts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,25 @@ let doc1 = Automerge.change(Automerge.init(), (doc) => {
let doc2 = Automerge.change(Automerge.init(), (doc) => {
doc.x = 2;
});
doc1 = Automerge.merge(doc1, doc2);
doc2 = Automerge.merge(doc2, doc1);
// Now, we can't tell which value doc1.x and doc2.x are going to assume --
let doc1_merged_with_doc2 = Automerge.merge(doc1, doc2);
let doc2_merged_with_doc1 = Automerge.merge(doc2, doc1);

// Now, we can't tell which value x will assume in the new, merged docs --
// the choice is arbitrary, but deterministic and equal across both documents.
assert.deepEqual(doc1, doc2);
assert.deepEqual(doc1_merged_with_doc2, doc2_merged_with_doc1);
```

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. Suppose `doc.x = 2` is chosen as the
"winning" value:

```js
doc1; // {x: 2}
doc1; // {x: 1}
doc2; // {x: 2}
Automerge.getConflicts(doc1, "x"); // {'1@01234567': 1, '1@89abcdef': 2}
Automerge.getConflicts(doc2, "x"); // {'1@01234567': 1, '1@89abcdef': 2}
doc1_merged_with_doc2; // {x: 2}
doc2_merged_with_doc1; // {x: 2}
Automerge.getConflicts(doc1_merged_with_doc2, "x"); // {'1@01234567': 1, '1@89abcdef': 2}
Automerge.getConflicts(doc2_merged_with_doc1, "x"); // {'1@01234567': 1, '1@89abcdef': 2}
```

Here, we've recorded a conflict on property `x`. The object returned by `getConflicts` contains the
Expand Down