From 4b12c6b78b5b6cd2b3f70c4c59f20fa3216adaa4 Mon Sep 17 00:00:00 2001 From: Sergey Chernov Date: Wed, 21 Jun 2023 10:56:12 +0000 Subject: [PATCH] Update 'safe multimerge' --- safe-multimerge.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/safe-multimerge.md b/safe-multimerge.md index af191a4..2b59ade 100644 --- a/safe-multimerge.md +++ b/safe-multimerge.md @@ -12,27 +12,27 @@ sequenceDiagram participant Server Note over Server, Alice: initial data: Hello world par conflicting update 1 - Alice->>+Server: data: Hello, world! - Server-->>-Alice: accepted - Bob->>+Server: data: Hello, cruel world - Server -->> Bob: merge request - Carol->>+Server: data: Bye, world - Server -->> Carol: merge request + Alice ->>+Server: data: Hello, world! + Server -->>- Alice: accepted + Bob ->>+ Server: data: Hello, cruel world + Server -->>- Bob: merge request + Carol ->>+ Server: data: Bye, world + Server -->>- Carol: merge request end note left of Server: now "Hello, world!" par conflicting update 2 Bob->>+Server: data: Hello, cruel world! - Server -->> Bob: accepted - Carol->>+Server: data: Bye, world! - Server -->> Carol: merge request + Server -->>- Bob: accepted + Carol->>+ Server: data: Bye, world! + Server -->>- Carol: merge request Server --) Alice: update data end note left of Server: now Hello, cruel world! par update 3 - Carol->>+Server: data: Bye, cruel world! - Server -->> Carol: accepted + Carol->>+ Server: data: Bye, cruel world! + Server -->>- Carol: accepted Server --) Alice: update data Server --) Bob: update data end