Fix don't save server file when gen conflict file (#636)

Co-authored-by: 杨赫然 <[email protected]>
haiwen · Nov 2, 2023 · f659a91 · f659a91
1 parent 6063e09
commit f659a91
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/fileserver/merge.go b/fileserver/merge.go
@@ -161,6 +161,7 @@ func mergeEntries(storeID string, dents []*fsmgr.SeafDirent, baseDir string, opt
 				return nil, err
 			}
 			dents[2].Name = conflictName
+			mergedDents = append(mergedDents, head)
 			mergedDents = append(mergedDents, remote)
 			opt.conflict = true
 		}