You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
body: _('There was a [conflict](%s) on the attachment below.\n\n%s','https://joplinapp.org/conflict/',Resource.markdownTag(conflictResource)),
is_conflict: 1,
},{changeSource: ItemChange.SOURCE_SYNC});
}
The note is marked as conflict and so will be skipped during sync but it looks like the duplicated resource will still be uploaded to the sync target.
The text was updated successfully, but these errors were encountered:
roman-r-m
changed the title
Potential orphaned resources on resource conflict
Potential orphaned resources left on sync target on resource conflict
Jul 22, 2021
Indeed I think the implementation is not quite right. It's also not logical to create a conflict note when it's the resource that's actually in conflict. Maybe the note should simply be added to a regular notebook, so that there's no special rules applying to it.
It looks like whenever there's a resource conflict, Synchronizer will create a new copy of the conflicted resource and attach it to a new note:
joplin/packages/lib/models/Resource.ts
Lines 392 to 402 in f611d77
The note is marked as conflict and so will be skipped during sync but it looks like the duplicated resource will still be uploaded to the sync target.
The text was updated successfully, but these errors were encountered: