From 2aaa1e33859164772dddb18f320c3b25cef8325f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=B5=AB=E7=84=B6?= Date: Thu, 2 Nov 2023 10:14:03 +0800 Subject: [PATCH] Fix don't save server file when gen conflict file --- fileserver/merge.go | 1 + 1 file changed, 1 insertion(+) diff --git a/fileserver/merge.go b/fileserver/merge.go index cf1f37e5..f3c7bd6f 100644 --- 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 }