From fefc82656c53f6e2d2a4f533cb5b212ae2ef1b45 Mon Sep 17 00:00:00 2001 From: Sergey Chernov Date: Wed, 21 Jun 2023 10:53:30 +0000 Subject: [PATCH] Update 'safe multimerge' --- safe-multimerge.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/safe-multimerge.md b/safe-multimerge.md index 4ad262e..af191a4 100644 --- a/safe-multimerge.md +++ b/safe-multimerge.md @@ -37,10 +37,9 @@ sequenceDiagram Server --) Bob: update data end note left of Server: now Hello, cruel world! - Note over Server, Alice: syncronized data: Bye, cruel world! + Note over Server, Alice: synchronized data: Bye, cruel world! ``` - -Note that update data pushes from the server are send asynchronously and in the case the party got "merge required" answer the rendundant notification could be trashed by the server, this is a RC based issue, so each "merge required" and "update data" has identification data to avoid repeating updates/megres. +Note that the `update data` push from the server is send asynchronously and in the case the party got "merge required" answer the rendundant notification could be trashed by the server, this is a RC based issue, so each "merge required" and "update data" has identification data to avoid repeating updates/megres.