MichaelMure/git-bug
1
1
Fork 0
mirror of https://github.com/MichaelMure/git-bug.git synced 2024-12-13 20:13:15 +03:00
Code Issues Projects Releases Wiki Activity

model: Moves example description after the example

Browse Source
This commit is contained in:
Robin Vobruba 2022-05-04 12:11:11 +02:00
parent 543e7b78f5
commit 2a0331e2dd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/model.md
View File

@ -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)