plugin-conflict-resolution

plugin-conflict-resolution copied to clipboard

ifurther

Adding the [`joplin-plugin`](https://github.com/topics/joplin-plugin) topic could help with discovery via GitHub.

andypiper

Mysterious popup shown instead of conflict resolution window

4

When I try to resolve a conflict and I right-click on the note and select `Resolve Conflict` this comes up instead:  Joplin 2.12.15, running on Linux. Conflict Resolution v....

quasipedia

Is it possible to check conflicts/diff in any folder?

10

Sorry if this is not the correct channel for questions/support. I could not find any info on the readme.md I had conflicts in a mobile instance. Since I cannot run...

dioni21

I'm having somewhat similar issue to the person who is getting empty files to compare. As of the last update, every time I get an indication of conflicting note and...

bunk3m

First of all, thank you for the AWESOME plugin. Some conflicts have been popping on empty notes (notes that have just the note title). When I try to use the...

pmmontanari