Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-24 07:29:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use dateResolved to prevent recursive merge conflicts

Browse Source
This commit is contained in:
thecodrr
2021-08-10 11:59:56 +05:00
parent 1ca53f939e
commit 14fed3e8bb
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/api/sync/merger.js
View File

@@ -47,14 +47,17 @@ class Merger {
}
}
async _mergeItemWithConflicts(remoteItem, get, add, resolve) {
async _mergeItemWithConflicts(remoteItem, get, add, markAsConflicted) {
let localItem = await get(remoteItem.id);
remoteItem = await this._deserialize(remoteItem);
if (!localItem) {
await add(remoteItem);
} else if (localItem.dateEdited > this._lastSynced) {
await resolve(localItem, remoteItem);
} else if (
localItem.dateResolved !== remoteItem.dateEdited &&
localItem.dateEdited > this._lastSynced
) {
await markAsConflicted(localItem, remoteItem);
} else {
await add(remoteItem);
}