Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mysterious popup shown instead of conflict resolution window #20

Open
quasipedia opened this issue Sep 20, 2023 · 4 comments
Open

Mysterious popup shown instead of conflict resolution window #20

quasipedia opened this issue Sep 20, 2023 · 4 comments
Labels
bug Something isn't working enhancement New feature or request

Comments

@quasipedia
Copy link

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

@JackGruber JackGruber added bug Something isn't working enhancement New feature or request labels Sep 20, 2023
@JackGruber
Copy link
Collaborator

JackGruber commented Sep 20, 2023

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

@quasipedia
Copy link
Author

quasipedia commented Oct 4, 2023

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?

@JackGruber
Copy link
Collaborator

JackGruber commented Oct 5, 2023

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.

@personalizedrefrigerator

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

3 participants