clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-03 02:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sync): code start base of diff-merge

Browse Source
This commit is contained in:
Andelf
2023-06-27 11:31:24 +08:00
parent eb49128f4b
commit 4e1b7dd2c1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/frontend/fs/sync.cljs
View File

@@ -1650,12 +1650,12 @@
:else
(do
(prn "[diff-merge]no base found, use empty content as base, avoid loosing data")
(prn "[diff-merge]no base found, failback")
(p/let [current-content (-> (fs/read-file repo-dir current-change-file)
(p/catch (fn [_] nil)))
current-content (or current-content "")
incoming-content (fs/read-file repo-dir incoming-file)
merged-content (diff-merge/three-way-merge "" current-content incoming-content format)]
merged-content (diff-merge/three-way-merge current-content current-content incoming-content format)]
(if (= incoming-content merged-content)
(p/do!
(fs/copy! repo