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

Conflict Resolution Plugin

JackGruber 21 May 2021 18:45 5

Will there also be the possibility to directly compare two notes (no conflict note and revision)?

2 Likes

Report Week 6 (11.07 - 18-07)

Topic		Replies	Views
Plugin: Conflict Resolution Plugins	30	17083	20 March 2025
Any suggestions on what plugins could be created? Features	242	24176	8 September 2025
[SOLVED] Tips for removing safely duplicated notes from two very similar notebooks Support	10	2562	11 December 2021
2024-06-14 - A closer look at a new conflict Support	21	254	17 July 2024
Real-Time Collaboration on a Note - Project Real-Time Collaboration	37	5284	18 June 2021