feat: add notebook merging

2025-12-21 22:19:41 +01:00 · 2021-02-25 19:41:17 +05:00
parent 952aa5e58c
commit 03e21221c7
4 changed files with 129 additions and 7 deletions
--- a/packages/core/api/sync/merger.js
+++ b/packages/core/api/sync/merger.js
@@ -106,7 +106,7 @@ class Merger {
    await this._mergeArray(
      notebooks,
      (id) => this._db.notebooks.notebook(id),
-      (item) => this._db.notebooks.add(item)
+      (item) => this._db.notebooks.merge(item)
    );

    await this._mergeArrayWithConflicts(