SergeychWorks/mp_diff
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

removed conflict data from blocks as it is not needed and not yet implemented

Browse Source
This commit is contained in:
Sergey Chernov 2023-03-23 18:38:26 +01:00
parent 2249eb539a
commit a1c5d9ee88
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -4,7 +4,7 @@ plugins {
} }
group = "net.sergeych" group = "net.sergeych"
version = "0.0.3-SNAPSHOT" version = "0.0.4-SNAPSHOT"
repositories { repositories {
mavenCentral() mavenCentral()

16
src/commonMain/kotlin/net.sergeych.merge3/merge3.kt
View File

@ -60,14 +60,14 @@ sealed class MergedBlock<T> {
*/ */
data class Resolved<T>(override val data: List<T>) : MergedBlock<T>() data class Resolved<T>(override val data: List<T>) : MergedBlock<T>()
/** // /**
* The portion of data that can't be merged due to the conflicting changes. // * The portion of data that can't be merged due to the conflicting changes.
* __Note it is not yet used.__ // * __Note it is not yet used.__
*/ // */
@Suppress("unused") // @Suppress("unused")
data class Conflict<T>(val variantA: List<T>, val variantB: List<T>) : MergedBlock<T>() { // data class Conflict<T>(val variantA: List<T>, val variantB: List<T>) : MergedBlock<T>() {
override val data = variantA + variantB // override val data = variantA + variantB
} // }
} }