From 2a0331e2ddc147b8616caa52d8a7c0432e56af1c Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Wed, 4 May 2022 12:11:11 +0200 Subject: [PATCH] model: Moves example description after the example --- doc/model.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/model.md b/doc/model.md index 94528bc397be4595ef4dab307a3220f6ecac5891..4cadfc9a8071cf03515f48dd53b26159fab76d5a 100644 --- a/doc/model.md +++ b/doc/model.md @@ -118,13 +118,15 @@ git-bug apply the following algorithm: Step 2 is providing and enforcing a constraint over the `Operation`'s logical clocks. What that means is that we inherit the implicit ordering given by the DAG. Later, logical clocks refine that ordering. This, coupled with signed commit has the nice property of limiting how this data model can be abused. -Here is an example of such an ordering. We can see that: +Here is an example of such an ordering: + +![merge scenario 1](merge1.png) + +We can see that: - Lamport clocks respect the DAG structure - the final `Operation` order is [A,B,C,D,E,F], according to those clocks -![merge scenario 1](merge1.png) - When we have a concurrent edition, we apply a secondary ordering based on the `OperationPack`'s identifier: ![merge scenario 2](merge2.png)