aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRobin Vobruba <hoijui.quaero@gmail.com>2022-05-04 12:11:11 +0200
committerRobin Vobruba <hoijui.quaero@gmail.com>2022-05-04 12:11:11 +0200
commit2a0331e2ddc147b8616caa52d8a7c0432e56af1c (patch)
tree5231d472ea379446e5478319361d48ed988197df /doc
parent543e7b78f5eb443a80e0c4e8edd4a954646f9663 (diff)
downloadgit-bug-2a0331e2ddc147b8616caa52d8a7c0432e56af1c.tar.gz
model: Moves example description after the example
Diffstat (limited to 'doc')
-rw-r--r--doc/model.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/model.md b/doc/model.md
index 94528bc3..4cadfc9a 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)