# Locked in a permanent state of conflict. How to resolve it? Copy paste doesn't work

**URL:** <https://discourse.joplinapp.org/t/locked-in-a-permanent-state-of-conflict-how-to-resolve-it-copy-paste-doesnt-work/18729>\
**Category:** Support\
**Created:** [13 July 2021 21:20 UTC](https://discourse.joplinapp.org/t/locked-in-a-permanent-state-of-conflict-how-to-resolve-it-copy-paste-doesnt-work/18729 "2021-07-13T21:20:51Z")\
**Posts on this page:** 6\
**Page:** 1

<div class="post-metadata">

**Author:** ![tribbloid](https://yyz2.discourse-cdn.com/flex028/user_avatar/discourse.joplinapp.org/tribbloid/32/9559_2.png) [@tribbloid](https://discourse.joplinapp.org/u/tribbloid)\
**Post date:** [13 July 2021 21:20 UTC](https://discourse.joplinapp.org/t/locked-in-a-permanent-state-of-conflict-how-to-resolve-it-copy-paste-doesnt-work/18729/1 "2021-07-13T21:20:51Z")

</div>

Every time I make edit to a notebook. My change got reverted and pushed into a conflict folder

In git this will be resolved immediately to get a unified version

How to fix it?

---

<div class="post-metadata">

**Author:** ![dpoulton](https://yyz2.discourse-cdn.com/flex028/user_avatar/discourse.joplinapp.org/dpoulton/32/29723_2.png) [@dpoulton](https://discourse.joplinapp.org/u/dpoulton)\
**Post date:** [13 July 2021 22:40 UTC](https://discourse.joplinapp.org/t/locked-in-a-permanent-state-of-conflict-how-to-resolve-it-copy-paste-doesnt-work/18729/2 "2021-07-13T22:40:06Z")

</div>

> [@tribbloid](#):
>
> How to fix it?

You posted in development rather than support (moved). If you had posted in support you would have seen:

> [SCROLL AND READ BEFORE POSTING]  
> For bug reports, please post them on GitHub - [Issues · laurent22/joplin · GitHub](https://github.com/laurent22/joplin/issues)  
> If you post a bug report here, we cannot track it and there's a chance it won't be looked at and fixed.  
> For other support queries please indicate:
> 
> - The version you are using. LATEST VERSION is not a version number!
> - If it is a sync issue, please let us know what you are syncing with.
> - If you report a problem with upgrading, please let us know both versions (from/to).
> - If you report a problem with the editor, please tell us which editor you are using (WYSIWYG/Markdown).
> - The operating system you are using.  
> If you can also please provide a log, as described here: [https://joplinapp.org/debugging](https://joplinapp.org/debugging)  
> **Posts that do not at least state the version number and operating system will not be answered.**

Not trying to be petty but in order to stand a chance of providing support your fellow users or devs, on the forum or GitHub, need an idea about what the problem actually is.

---

<div class="post-metadata">

**Author:** ![tribbloid](https://yyz2.discourse-cdn.com/flex028/user_avatar/discourse.joplinapp.org/tribbloid/32/9559_2.png) [@tribbloid](https://discourse.joplinapp.org/u/tribbloid)\
**Post date:** [13 July 2021 23:21 UTC](https://discourse.joplinapp.org/t/locked-in-a-permanent-state-of-conflict-how-to-resolve-it-copy-paste-doesnt-work/18729/3 "2021-07-13T23:21:04Z")

</div>

This is not a bug report. I'm looking for a way to manually resolve the conflict (e.g. by editing save files on the cloud)

To answer your question:

- version number: 2.1.8
- sync target: Dropbox pesonal
- not an upgrade or editor issue
- OS: ubuntu 20.04
- Sorry I forgot to generate the log file. I'll see if I can reproduce it later

Thanks a lot for your help

---

<div class="post-metadata">

**Author:** ![dpoulton](https://yyz2.discourse-cdn.com/flex028/user_avatar/discourse.joplinapp.org/dpoulton/32/29723_2.png) [@dpoulton](https://discourse.joplinapp.org/u/dpoulton)\
**Post date:** [13 July 2021 23:27 UTC](https://discourse.joplinapp.org/t/locked-in-a-permanent-state-of-conflict-how-to-resolve-it-copy-paste-doesnt-work/18729/4 "2021-07-13T23:27:16Z")

</div>

> [@tribbloid](#):
>
> ...editing save files on the cloud

If I understand you correctly, you can't do that. Joplin works at client level. The files on the cloud storage are there for syncing **only**. Editing within dropbox / cloud storage is not supported. The only way to modify notes is using the Joplin client.

---

<div class="post-metadata">

**Author:** ![Ahmad45123](https://yyz2.discourse-cdn.com/flex028/user_avatar/discourse.joplinapp.org/ahmad45123/32/7714_2.png) [@Ahmad45123](https://discourse.joplinapp.org/u/Ahmad45123)\
**Post date:** [14 July 2021 06:10 UTC](https://discourse.joplinapp.org/t/locked-in-a-permanent-state-of-conflict-how-to-resolve-it-copy-paste-doesnt-work/18729/5 "2021-07-14T06:10:31Z")

</div>

Check out this plugin to help resolve your conflict.

> [@Conflict Resolution Plugin](https://discourse.joplinapp.org/t/conflict-resolution-plugin/17489):
>
> Hey All! I'm Ahmed, an undergraduate student from Egypt. I'm excited to work through the summer on a plugin that improves the process of conflict resolution on Joplin. Summary A plugin will be created that adds a context menu option on conflict notes to open a merge menu. Once clicked a diff viewer will be shown to aid in merging the notes together. I'll potentially also add a way to auto-merge the two conflicting notes using revision data. Implementation Since the project doesn't have a set-…

You can download it through Joplin itself.

---

<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:** [13 August 2021 06:10 UTC](https://discourse.joplinapp.org/t/locked-in-a-permanent-state-of-conflict-how-to-resolve-it-copy-paste-doesnt-work/18729/6 "2021-08-13T06:10:46Z")

</div>

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