self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-24 23:26:50 +02:00
Code Issues Releases Activity

All: Conflict notes will now populate a new field with the ID of the conflict note. (#5049)

Browse Source
This commit is contained in:
Ahmad Mamdouh
2021-06-12 09:46:49 +02:00
committed by GitHub
parent 6803f1c6a7
commit 2af3bf61ea
7 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/lib/Synchronizer.ts
View File

@ -610,10 +610,7 @@ export default class Synchronizer {
// ------------------------------------------------------------------------------
if (mustHandleConflict) {
const conflictedNote = Object.assign({}, local);
delete conflictedNote.id;
conflictedNote.is_conflict = 1;
await Note.save(conflictedNote, { autoTimestamp: false, changeSource: ItemChange.SOURCE_SYNC });
await Note.createConflictNote(local, ItemChange.SOURCE_SYNC);
}
} else if (action == 'resourceConflict') {
// ------------------------------------------------------------------------------