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?

[image] 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 If you post a bug report here, we ca…

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…

[image] 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 J…

Check out this plugin to help resolve your conflict. [image] Conflict Resolution Plugin Conflict Resolution 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 resolu…

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

Support

Ahmad45123 14 July 2021 06:10 5

Check out this plugin to help resolve your conflict.

You can download it through Joplin itself.

Topic		Replies	Views
Spurious conflicts after Dropbox move Support	2	246	23 January 2024
Conflicts occuring when they shouldn't be Support	14	1322	22 March 2021
'Conflicts'? Support	5	8184	7 September 2020
First conflict ever and a mistery Support	5	628	17 November 2023
Plugin: Conflict Resolution Plugins	30	18953	20 March 2025

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

Related topics