Plugin: Conflict Resolution

Glad to hear, it appears that I missed it somehow. These buttons are a little small and dim on my macOS dark theme, Joplin 2.4.2.

I resorted to copy and pasting, and therefore my comment above.

4 Likes

Can't blame you for missing that!

@Ahmad45123 is there a way to make the arrows more visible? Maybe making them bigger, or at least a brighter colour?

1 Like

I'll look into it. Should be possible.

1 Like

@shikuz I've released a new update with slightly bigger arrows. The arrows will now match current theme as well to prevent them from "hiding" with the background.

Let me know if it's better now :slight_smile:

2 Likes

thanks @Ahmad45123! appreciate the fast response.
is the new version v1.2.2?
I'm not sure if I received the update, seems like my arrows are still the same color/size.

Latest plugin version is 1.2.10. You have to update manually through Joplin Plugins interface.

@Ahmad45123 still can't see the latest version on the plugins list in the app (for instance, the most recent version here is v1.2.2). do I need to download the file manually from somewhere?

Sorry for the delay! I was on a vacation.
I think I've found the issue. Check and let me know :slight_smile:

E: You should be able to update now.

3 Likes

No worries.
Looks better! Thank you for the fix, and again for the plugin!

1 Like

I'd like to know if the plugin is made just for conflict or if it can be used also in order to solve conflicts generated by a user which would led to have identical or almost identical notes in the collection of notes.

3 Likes

I'm not sure what do you mean exactly? Like ability to compare any 2 different notes, regardless of conflict ?

Exactly. I had problems of synchronization with joplin or earlier (my problem consists of 5000 notes imported from google keep that are almost all duplicated) and I did not found a better solution so that to keep two sets of almost the same notes. In most notes the only difference is that one note have the title repeated inside the note and the other does not have it. Is there is a way to simulate a conflict? I could change time of all this notes by switching from note to task and to notes back at different time on my desktop and my laptop without internet during this "move". Will this induce a conflict for those notes?

Hmm. I'm not sure if simply switching from Task to Note or vice versa will induce a Conflict. Worth trying but it's something that's decided by Joplin itself and not my plugin. Regardless, I've seen many people request the ability to show a diff between any 2 arbitrary notes. I'll be adding that feature soon in this plugin or maybe a separate new plugin.

3 Likes

In that case there's no conflict and the version with the latest timestamp will be kept.

Yes! I was totally mistaken.

What I'd like to do is to select a set of notes and to find the most similar ones. Let say something similar to more than 90% of words are identical would probably do the job. In my own case, it would lead to about 4000 notes that are "almost the same".

For example I have very similar notes that are like this:

image

The small difference is an additional line that copies the title of the other note. This will probably be difficult for a plugin to solve my problems. I mean make it very efficient to solve my problems. In fact, with 4000 notes like that and about 10 seconds by notes I could solve this manually in less than a week but with the risk of not seeing possibly small difference. What would be needed is a merge that keep identical parts and include unique parts "automatically" or almost automatically (in one click). I don´t know if this is a common case and an accepted solution. Maybe.

1 Like

Does that imply that currently, Joplin has no way to resolve conflicts, even in a primitive way?
I had something written in a note on my computer for some time.
I opened briefly Joplin on my phone to paste a reference, in the same note (not at the same place).
Later, I opened the note on my computer, it synchronized, and I lost the first part, the whole note was replaced by the version on the phone, which wasn't synchronized, as it didn't have the time (I think).

Joplin doesn't try to merge the two versions? It just choose the latest one, disregarding any previous change? It is very dangerous for such decentralized software, I think. You can loose lot of text this way.
I suppose there is no way to recover the lost part.

Anyway, I will install this plugin right away!

[EDIT 1] I just stumble upon this page: What is a conflict? | Joplin (looking where the mentioned "Joplin's Plugin Repository" might be hidden), and I don't seem to have a "Conflict notebook"… What do I miss?
[EDIT 2] Well, I don't see this repository mentioned in the documentation either…

1 Like

When a conflict occurs, Joplin first copies the current
local note to a new Conflicts folder. Then it replaces the local note with the latest from the server.

It doesn't automerge. You have to merge manually. The plugin simply helps you out by showing a diff window.

The conflicts folder should appear on your PC colored Red.

As said (in my edits you might have missed when answering), I don't have such notebook. I guess Joplin missed the conflict, somehow. It wasn't very important this time, but it is annoying, it is not the first time I loose some text.
And I don't see in the Joplin documentation how to install a plugin (I saw how to make one, which is interesting for me, but not for the average user…). Did I miss something?

[EDIT] OK, I found it hidden in the Options… I was searching if the conflict management is under an option too.

When I right click and select Conflict Resolution, I get a "Not Found" error window. I installed through the Options, Plugins menu.