Skip to content

Commit d3ebcf1

Browse files
committed
docs: description for what LinearHistory does
1 parent 28e44b2 commit d3ebcf1

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

model-datastructure/src/commonMain/kotlin/org/modelix/model/LinearHistory.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ import org.modelix.model.lazy.IDeserializingKeyValueStore
55
import org.modelix.model.lazy.KVEntryReference
66
import org.modelix.model.persistent.CPVersion
77

8+
/**
9+
* When merging two branches there might be conflicts between operations that need to be resolved in a deterministic
10+
* way. This class puts them in an order that preserves the order of earlier merges.
11+
*/
812
class LinearHistory(val baseVersionHash: String?) {
913

1014
val version2descendants: MutableMap<Long, MutableSet<Long>> = HashMap()

0 commit comments

Comments
 (0)