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	16127	20 March 2025
Report Week 4 (27.06 - 04-07) Conflict Resolution	4	515	5 July 2021
Report Week 5 (04.07 - 11-07) Conflict Resolution	2	642	12 July 2021
Report Week 6 (11.07 - 18-07) Conflict Resolution	2	675	18 July 2021
Report Week 8 (25.07 - 01.08) Conflict Resolution	0	675	2 August 2021