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
@@ -488,7 +488,7 @@ func (f *folder) scanSubdirs(subDirs []string) error {
 			case !ok:
 			case gf.IsEquivalentOptional(fi, f.modTimeWindow, false, false, protocol.FlagLocalReceiveOnly):
 				// What we have locally is equivalent to the global file.
-				fi.Version = fi.Version.Merge(gf.Version)
+				fi.Version = gf.Version
 				fallthrough
 			case fi.IsDeleted() && (gf.IsReceiveOnlyChanged() || gf.IsDeleted()):
 				// Our item is deleted and the global item is our own