I'm using the Mobile App Version 1.6.7 and I've run into a Conflict. I reviewed the FAQ, but it just tells what a conflict is, it doesn't explain how to resolve it. I also searched the forums, but couldn't find a clear answer to my question. if I missed it, feel free to point me to the post.
What I was hoping was that I could sync to the desktop and use a diffing tools like Meld to figure ou the differences, because the note is pretty log. The Conflict only appears on the Mobile App.
Also it isn't clear how to clear the conflict, once it is resolved. I could try deleting the note, but I'm a bit nervous about doing that because when I try to tap on the conflict it takes me to the original note, and I don't want to accidentality delete the original since Joplin doesn't have a trash system from which to recover a deleted note.
@tessus, no worries and thanks for the reply. I finally figured it out through experimentation. Looks like the solution I came up with was pretty close to what you are doing. I just added a backup just to be safe.
I really love being able to diff the version since the content is written on markdown. But with that said it feel like it could be a bit easier to resolve conflicts. A couple of quick thoughts.
Sync conflicts across devices
Maybe add a plugin that lets you point to any 2 notes and call an external diff tool to compare them
Came here to suggest this exactly thing. I can't help but notice there still isn't one of these despite the brilliant suggestion. Not sure, is there was way to prioritization and roadmap? I'm finding Joplin very useful as a cross platform tool, but would love to have an easy way to resolve conflicts.
The problem is that conflict resolution is a highly complex topic, or at least it can become one.
There's no automatic path or algorithm one can use. Conflict resolution is always a manual process, unless you are ok with losing data.
Adding a diff tool into Joplin with an option to merge and create a new note is a bit out of the scope of this project. However, a plugin might be able to accomplish that. The simplest solution is to use an external diff tool and manually update the note in Joplin. I guess we'll see what people come up with.