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

[Ahmad45123]

Check out this plugin to help resolve your conflict.

Conflict Resolution Plugin

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

You can download it through Joplin itself.