Conflict Resolution Plugin

[Ahmad45123]

@JackGruber

Unfortunately I didn't see if the orginal noteId is assigned to the conflict note somewhere, because the field is_conflict only contains 1 or 0, you might have to adjust something for this when the noteId is currently not available.

I noticed this too. And was thinking about modifying the is_conflict field to be the noteId if it's a conflict and 0 otherwise I could also just add a new column/field but if changing is_conflict won't break anything I believe it's better then a completely new column?

[laurent]

You'd still need to change the column type to a string, so I'm not sure if it's better than creating a new column.

[manouchk]

When i was reading the following comment: [quote="laurent, post:9, topic:17489"]
a plugin that shows the two versions of the notes side by side with a way to manually merge them would already be very useful [/quote], I though that the plugin may identify sections that are identical. Each sections may be associated with a checkbox, that could accelerate the manual merging of notes. A checkbox would be associated to identical sections (found in both notes) and unique section (found in a single note).
On the top of the view of the two notes, there could also be checkbox corresponding to each notes because in some case, a single notes may be the correct choice. This would adjust the lateral checking of box correspondingly in order to fit the selection made...

[Ahmad45123]

@manouchk

I though that the plugin may identify sections that are identical. Each sections may be associated with a checkbox, that could accelerate the manual merging of notes. A checkbox would be associated to identical sections (found in both notes) and unique section (found in a single note).

Something similar is already implemented if you check out the plugin There's going to be small buttons in between sections which you can press to move over the changed section from one to the other.

@manouchk

On the top of the view of the two notes, there could also be checkbox corresponding to each notes because in some case, a single notes may be the correct choice. This would adjust the lateral checking of box correspondingly in order to fit the selection made...

That's a good idea. Will consider adding it.

[manouchk]

@Ahmad45123

Something similar is already implemented if you check out the plugin There's going to be small buttons in between sections which you can press to move over the changed section from one to the other.

Ok, but it only is made for the case of conflict detected by joplin. The plugin cannot be used to seek possibly similar notes so that it would then apply its way of working in this case. Correct?

[dioni21]

I just had one use case.

I had conflicts on my mobile app. But the mobile app does not allow plugins, and the conflicts folder is local to each instance.

So I created a temp folder and moved all conflicts there, for them to be synced. All this in the hope that the desktop plugin would be useful. It is not, as it is now.

So, I can see two approaches, and maybe BOTH are valid to implement.

• Expand or fork Conflict Resolution Plugin to a generic diff plugin, as others have mentioned here.
• Somehow, sync the Conflicts Folder. Not sure if this is viable.
  • Another approach is to put conflicts in the same original folder, with a changed name. Dropbox does this, IIRC.

[Tobi]

I just want to say thank you for the great plugin.
It reminds me a lot of meld, very good.