- Added Open Conflict button to notes.
- Merged the PR for adding the column
- Added the diff dialog which will show both notes in both sides for diff viewing.
You may also download the current plugin through here if you'd like to try it yourself: https://github.com/joplin/plugin-conflict-resolution/releases/download/v0.1/joplin-plugin-conflict-resolution.jpl
Don't expect much yet but any feedback is very appreciated.
- Add a way to handle note title conflicts.
- Work on UX a little to make it clear which will be saved etc.
- Add the window for selecting the target note when conflict_parent_id isn't specified.