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.
I'm suprised no one knew the answer to this. So I decided to experiment.
Made a copy of the conflicting note on my mobile device and synced both my desktop and mobile devices
Copied the text in to a diffing tool and compared the notes and resolved the conflict and put it back in the original note and synced on both the desktop and mobile
Made a back up of the original notes, just in case anything happened
Deleted the extra copy I no longer needed and synced both the desktop and mobile devices
I then deleted the note from the Conflict folder and synced both the desktop and mobile devices
The Conflict folder then disappeared from my mobile.
Note to self, make sure that the sync is complete before editing notes.
This seems to have resolved the issue without losing the original note.
Not sure why it never appeared on my desktop, but I was able to work around that by making a copy.
I duplicate the note in the Conflicts folder (renaming doesn't work, because the id would still be the same)
I move it to the same folder as the original note
delete the note in the Conflicts folder
sync
I use an external diff tool (usually just copy and paste the content into it) to check what the differences are and maybe create a new note with stuff from both
copy back the new content to the orig note, delete the duplicated 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.
The 3 first steps are the least of the issues when handling a conflict. Ans yes, they could be automated when one were to choose a menu item like Start conflict resolution.
But the first 3 steps are not the problem. When someone figures out a proper and easy way to handle the diff, we can talk about the first 3 steps....
. We are agree to say it’s easier to compare diff in Joplin desktop. Your 3 first steps could be automatic in Joplin without plugin ?