diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/api.md b/docs/api.md index 41a4f4d..a839f74 100644 --- a/docs/api.md +++ b/docs/api.md @@ -164,8 +164,10 @@ way on every node: * **The same key**: one write wins, the same one everywhere. "Newest" means by Automerge's operation order (the write made after seeing more changes; between equals, by the writer's actor ID), not by any clock: of two truly concurrent writes, which wins - is arbitrary, but it is the same on every node. Values their users signed come first - (Signed values, below): of those, the one its user numbered highest (`seq`). + is arbitrary, but it is the same on every node. Where the swarm's policy asks for + signed values (Signed values, below), a string that is an envelope comes before + anything else written there at once, a map too: of those, the one its user numbered + highest (`seq`), of equal ones the one with the lower SHA-256. * **Maps written at the same key** merge into one: their keys are united, each key as above. * **A write and a delete** of the same key: the write stays (a delete removes only what |
