# How to resolve conflicts?

**URL:** <https://discourse.joplinapp.org/t/how-to-resolve-conflicts/25197>\
**Category:** Support\
**Created:** [16 April 2022 13:14 UTC](https://discourse.joplinapp.org/t/how-to-resolve-conflicts/25197 "2022-04-16T13:14:11Z")\
**Posts on this page:** 3\
**Page:** 1

<div class="post-metadata">

**Author:** ![rsbrux](https://yyz2.discourse-cdn.com/flex028/user_avatar/discourse.joplinapp.org/rsbrux/32/17241_2.png) [@rsbrux](https://discourse.joplinapp.org/u/rsbrux)\
**Post date:** [16 April 2022 13:14 UTC](https://discourse.joplinapp.org/t/how-to-resolve-conflicts/25197/1 "2022-04-16T13:14:11Z")

</div>

12.7.1 under iPadOS, 2.7.2 under Android

This issue was raised over a year ago:

> [@How to Resole Conflicts on Mobile App](https://discourse.joplinapp.org/t/how-to-resole-conflicts-on-mobile-app/14507):
>
> 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 …

However, the help tiopic:  
[https://joplinapp.org/conflict/](https://joplinapp.org/conflict/)  
still has no guidance on resolving conflicts.  
I appreciate the impossibility of arutomating conflict resolution completely, but there are several ways in which the process could be facilitated, without incorporating diff / merge functions into joplin.  
The workaround described in the above-cited discourse post is cumbersome to say the least. It sounds easy to „duplicate a post“, but one must first open the conflicting post in edit mode, then copy the contents, then open a new post, paste in teh copied content and save it. Why not just provide a „duplicate“ or „save as“ function?  
Even more elegant would be a popup during sync offering the choice of one of the two conflicting versions or keeping the conflicting versions on the individual devices. This is an approach used by some other sync tools, e.g. the Outlook task sync facility in Samsung‘s Smart Switch.

---

<div class="post-metadata">

**Author:** ![MrKanister](https://yyz2.discourse-cdn.com/flex028/user_avatar/discourse.joplinapp.org/mrkanister/32/20054_2.png) [@MrKanister](https://discourse.joplinapp.org/u/MrKanister)\
**Post date:** [25 April 2022 19:57 UTC](https://discourse.joplinapp.org/t/how-to-resolve-conflicts/25197/2 "2022-04-25T19:57:16Z")

</div>

On desktop there is a plugin `Conflict Resolution` available to check the differences and merge them:

> [@Plugin: Conflict Resolution](https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204):
>
> Conflict Resolution Plugin This is the goto-plugin for whenever you're facing conflict issues! It'll provide a nice diff-window in which you can see the differences between your current note and the note received from cloud. How to use After you have a conflict note, you can simply right click the note in the conflicts folder and then you'll see a new button called Resolve Conflict. Pressing it will open the diff-window. In the case of using the plugin on an old conflict, the plugi…

---

<div class="post-metadata">

**Author:** ![system](https://canada1.discourse-cdn.com/flex028/uploads/cozic/original/3X/1/c/1c948e33314e232a0927789508474d8624f4270b.png) [@system](https://discourse.joplinapp.org/u/system)\
**Post date:** [25 May 2022 19:57 UTC](https://discourse.joplinapp.org/t/how-to-resolve-conflicts/25197/3 "2022-05-25T19:57:45Z")

</div>

This topic was automatically closed 30 days after the last reply. New replies are no longer allowed.