plugin-conflict-resolution icon indicating copy to clipboard operation
plugin-conflict-resolution copied to clipboard

Published 20 hours ago • verified publisher icon joplin

Mysterious popup shown instead of conflict resolution window

Open quasipedia opened this issue 1 year ago • 4 comments

When I try to resolve a conflict and I right-click on the note and select Resolve Conflict this comes up instead:

image

Joplin 2.12.15, running on Linux. Conflict Resolution v. 1.2.3

quasipedia avatar Sep 20 '23 08:09 quasipedia

OK you have delete the original, this is why you geht this error. The error message should be adapted-

JackGruber avatar Sep 20 '23 16:09 JackGruber

Hej, thank you for the timely reply. Got to answer only now, apologies.

I am not sure I'm following: should I "delete" or "delete not"? And "the original" refers to the local or remote version of the file?

quasipedia avatar Oct 04 '23 23:10 quasipedia

Oh a typo on the hurry ... You should not delete the notes until the conflict is resolved. The plugin can no longer compare the version in the conflict folder with the original.

JackGruber avatar Oct 05 '23 05:10 JackGruber

This seems to be fixed in Joplin 2.14.11 (Linux/build from commit 582f0853bb4a7e389daec03bce1682d910da267b).

personalizedrefrigerator avatar Feb 01 '24 20:02 personalizedrefrigerator