We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent f41b560 commit 35a0129Copy full SHA for 35a0129
model-datastructure/src/commonMain/kotlin/org/modelix/model/LinearHistory.kt
@@ -5,10 +5,6 @@ import org.modelix.model.lazy.IDeserializingKeyValueStore
5
import org.modelix.model.lazy.KVEntryReference
6
import org.modelix.model.persistent.CPVersion
7
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
- */
12
class LinearHistory(val baseVersionHash: String?) {
13
14
val version2descendants: MutableMap<Long, MutableSet<Long>> = HashMap()
0 commit comments