Home / GitHub Page

Diff for conflicting notes


I have to admit, it does not happen very often, but when it does, it’s rather a major annoyance.

When I see that there’s a conflict I’m basically stuck. Nothing tells me where the conflicts actually are.
So I have to paste both notes in separate files and use a diff on them.

I was wondering, if there was an easy way to show the note in the conflicting folder as follows:

blue background: text only available in remote note
red background: text only available in local note
white background: same in both notes

If this graphical representation is too complex, maybe there’s a diff plugin for electron or react-native, which only shows you a diff output of remote/local.