8-rays.dev/platform
1
0
Code Issues Packages Projects Wiki

Update 'safe multimerge'

Sergey Chernov 2023-06-21 10:56:12 +00:00
parent fefc82656c
commit 4b12c6b78b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
safe-multimerge.md

@ -15,24 +15,24 @@ sequenceDiagram
Alice ->>+Server: data: Hello, world! Alice ->>+Server: data: Hello, world!
Server -->>- Alice: accepted Server -->>- Alice: accepted
Bob ->>+ Server: data: Hello, cruel world Bob ->>+ Server: data: Hello, cruel world
Server -->> Bob: merge request Server -->>- Bob: merge request
Carol ->>+ Server: data: Bye, world Carol ->>+ Server: data: Bye, world
Server -->> Carol: merge request Server -->>- Carol: merge request
end end
note left of Server: now "Hello, world!" note left of Server: now "Hello, world!"
par conflicting update 2 par conflicting update 2
Bob->>+Server: data: Hello, cruel world! Bob->>+Server: data: Hello, cruel world!
Server -->> Bob: accepted Server -->>- Bob: accepted
Carol->>+ Server: data: Bye, world! Carol->>+ Server: data: Bye, world!
Server -->> Carol: merge request Server -->>- Carol: merge request
Server --) Alice: update data Server --) Alice: update data
end end
note left of Server: now Hello, cruel world! note left of Server: now Hello, cruel world!
par update 3 par update 3
Carol->>+ Server: data: Bye, cruel world! Carol->>+ Server: data: Bye, cruel world!
Server -->> Carol: accepted Server -->>- Carol: accepted
Server --) Alice: update data Server --) Alice: update data
Server --) Bob: update data Server --) Bob: update data
end end