Conflict Resolution Plugin v1.2.1

• Fixed bug where plugin didn't work with offficial released version of Joplin.

NOTE: The dynamic resizing feature of the UI will NOT work for the time being until Joplin releases an update from its side.

Conflict Resolution Plugin v1.2

• Dialog is now responsive and will resize itself depending on screen resolution.
• Added buttons to goto next difference and previous difference.
• Added button to move all changes to the right.
• Added options to toggle wordwrap, align changes and collapse unchanged.
• Added button to move title and used fontawesome icons.
• General code refactor and optimizations.

Conflict Resolution Plugin v0.2

• Code refactored a little more to allow for a more general diff-tool in the future.
• Added Save and Cancel button functionality.

The dialog actually works now! If you ever face a conflict, you can now simply right click it and hit "Resolve Conflict". It'll open a compare window where you can do your changes before saving.

Please do try it and let me know if you have any criticism :)

First week initial version

• Added Open Conflict button to notes.
• Added the diff dialog which will show both notes in both sides for diff viewing.