Homepage    |    GitHub    |    API    |    FAQ

Plugin: Conflict Resolution

Conflict Resolution Plugin

This is the goto-plugin for whenever you're facing conflict issues! It'll provide a nice diff-window in which you can see the differences between your current note and the note received from cloud.

How to use

After you have a conflict note, you can simply right click the note in the conflicts folder and then you'll see a new button called Resolve Conflict. Pressing it will open the diff-window.

In the case of using the plugin on an old conflict, the plugin may fail to find the source note to compare to, so, it'll open for you another window, in which, you can select the other note which you want to compare it. (Beware that this selected note will be overwritten with the new merged note!)

Download

You can get the latest version of the plugin through Joplins Plugin Repository inside of Joplin itself.

Bugs and feature requests

Please report any bugs you find and/or any features you'd like to see over at Github here: Issues · joplin/plugin-conflict-resolution · GitHub

However, if you don't have a Github account, reporting here in this thread also works :slight_smile:

7 Likes

Update v1.2

  • The plugin will now match Joplin's theme.
1 Like

I've been waiting for a while to get a conflict so I can try this plugin, and I finally have. Very useful plugin, thank you!

I just wish there was a one-click way to select the version you prefer to merge for each line/block, but even the current feature set makes it a lot easier to resolve conflicts.

2 Likes

Could you clarify this? Currently there is a button for each line/block (that's different) and a button to select merge all. It's not clear what you're suggesting that's different.

Perhaps something like this?


Source: Resolve conflicts | IntelliJ IDEA (jetbrains.com)

1 Like

There's a difficulty in automatically generating a "merged" note. We could do the same idea of a 3-way merge but the middle editor would start empty. The issue is also that using a.2-way diff shows that that the right note will be the one getting changed. A 3-way merge, however, is not very clear which is being saved.

We could always change but this is reasons I went this way. Lmk what do you think.

This screenshot shows a 3-way merge but the point I would like to show is providing intuitive buttons in the groove/gutter in the conflict resolve window. Sorry for any misunderstanding caused.

As for the intuitiveness of 3-way merge, I think it should be fine. The title of each panel shows the version, with the middle one saying "Result". The direction of arrows also shows the flow of lines.

1 Like

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.

2 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.

2 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 ?