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. Wha…

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…

Just wondering if anyone had any thoughts on he own to clear the conflicts on the Android mobile app since there doesn't seem to be any help.

Sorry, I somehow missed your original post. This is how I resolve conflicts: 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 externa…

@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 markd…

[image] arndtc: Maybe add a plugin that lets you point to any 2 notes and call an external diff tool to compare them That was my first idea for a plugin: [image] Any suggestions on what plugins could be created? Features A conflict resolution plugin with colored di…

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 creat…

Interesting :slightly_smiling_face:. 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 ?

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 abou…

ok, for Windows users I recommend the diff tool winmerge.org , it's open source and easy to use .

How to Resole Conflicts on Mobile App

Support

tessus 5 February 2021 04:17 6

That was my first idea for a plugin:

Topic		Replies	Views
How to resolve conflicts? Support	1	7585	25 April 2022
'Conflicts'? Support	5	8184	7 September 2020
Plugin: Conflict Resolution Plugins	30	18984	20 March 2025
Conflict - Neither matches Conflict Resolution	3	108	22 September 2025
2024-07-06 - Do you recommend where to start resolving conflicts? Support	6	249	19 July 2024

How to Resole Conflicts on Mobile App

Related topics