fix(sync): use empty as base when merge

novakda · Jul 14, 2023 · 56f5227 · 56f5227
1 parent eb2db96
commit 56f5227
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs
@@ -1655,7 +1655,7 @@
                                                                     (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 current-content incoming-content format)]
+                                                merged-content (diff-merge/three-way-merge "" incoming-content current-content format)]
                                           (if (= incoming-content merged-content)
                                             (p/do!
                                              (fs/copy! repo