lib/model: Use winning version instead of merge on conflict (#6995)

2020-10-19 08:53:19 +02:00
parent 01a7ef3b0f
commit 1a8c10a8d0
3 changed files with 4 additions and 15 deletions
@@ -75,7 +75,6 @@ func (f *sendOnlyFolder) pull() bool {
 			return true
 		}

-		file.Version = file.Version.Merge(curFile.Version)
 		batch = append(batch, file)
 		batchSizeBytes += file.ProtoSize()
 		l.Debugln(f, "Merging versions of identical file", file)