How to resolve conflicts?

[MrKanister]

On desktop there is a plugin Conflict Resolution available to check the differences and merge them:

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. [image] 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 plugi…