fix(sync): rebase

src/electron/electron/core.cljs

@@ -16,9 +16,7 @@
             [electron.git :as git]
             [electron.window :as win]
             [electron.exceptions :as exceptions]
-            ["/electron/utils" :as utils]
-            ["electron-context-menu" :as init-context-menu]
-            [goog.object :as gobj]))
+            ["/electron/utils" :as utils]))
 
 (defonce LSP_SCHEME "logseq")
 (defonce FILE_LSP_SCHEME "lsp")

src/electron/electron/handler.cljs

@@ -433,7 +433,6 @@
 
 (defmethod handle :update-remote-file [_ args]
   (apply rsapi/update-remote-file (rest args)))
->>>>>>> b06048fa0 (feat(sync): integrate file-sync-rsapi, update sync.cljs)
 
 (defmethod handle :update-remote-files [_ args]
   (apply rsapi/update-remote-files (rest args)))

src/main/frontend/fs/sync.cljs

@@ -36,6 +36,8 @@
 ;; - every 20s will flush local changes, and sync to remote
 
 ;; TODO: use access-token instead of id-token
+;; TODO: currently, renaming a page cause 2 file-watch event: unlink & add,
+;;       we need to a new type event 'rename'
 
 ;;; specs
 (s/def ::state #{::idle