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…

You mean like selecting any two notes and open a diff viewer just between the two ? Not really tbh, I've not planned this but I think we can squeeze that in..? However, I'm not sure if this fits with a plugin for "conflict resolution" or even if it'll fit within the time of GSoC? Maybe a separate …

@Ahmad45123 I'm having a little trouble understanding why so many changes are necessary in the core of Joplin (particularly around sync). Shouldn't it be possible to detect conflict notes without having to get so deep in to the guts of Joplin? It seems to me that the same thing can be achieved usi…

The basic plugin that I mention above is exactly what you describe: a simple dialog facility that will provide a diff viewer to aid in merging the 2 conflicting notes. (Like you mentiones, Should be simple to generalize it to work with any 2 notes, not necessarily conflicting) Why all the other stu…

Indeed we should avoid making changes to the synchronizer as there would be performance issues. And the current revision system wouldn't help you in this particular case. Isn't it possible to get some auto-merging with two way diff? It doesn't have to be perfect, as the result would have to be revi…

just wondering if #gsoc-projects:real-time-collaboration could be any help here, as there could be some conflict resolution necessary as well.

I've been trying to plan the UI/UX, and this is the initial design I've got in mind: [image] (Ignore the html code, just a placeholder...) Pretty basic design for now.. However I'm still not sure how would it "open" best ? I was thinking at first to add a button to the screen which appears when …

[image] Ahmad45123: Do you guys have any suggestions on what would be the option that is best for UX ? I find the option via the context menu or the tools good, because you can also search notes for comparison. But it should also be possible to select the note in a selection dialog. In a ki…

[image] Ahmad45123: Do you guys have any suggestions on what would be the option that is best for UX ? Maybe the plugin could detect that a conflict has occurred and show a popup notification. This may require a change to the plugin API

There is already a very mature UX for reference, please check the merge function of each Git visualization tool. . . Including VSCode, JetBrians IDE

Conflict Resolution Plugin

GSoC Projects Conflict Resolution

roman_r_m 22 May 2021 20:14 11

I'd say not, the whole point of real-time collaboration is to avoid conflicts while editing.

Real-Time Collaboration on a Note - Project

Topic		Replies	Views
Plugin: Conflict Resolution Plugins	30	18835	20 March 2025
Any suggestions on what plugins could be created? Features	258	26205	30 January 2026
[SOLVED] Tips for removing safely duplicated notes from two very similar notebooks Support	9	2809	11 November 2021
2024-06-14 - A closer look at a new conflict Support	20	303	17 June 2024
Real-Time Collaboration on a Note - Project Real-Time Collaboration	37	5492	18 June 2021

Conflict Resolution Plugin

Related topics