need to review all Conflicts

Eduard Metzger: thanks, I wasn't aware of the shortcut! I'd need an exact comparison. When I update a note by a little bit, it is often something vital to the info.

nopi: Ok, one solution might be a merge where both versions are copied into the new note. That's how GitHub works when there is a conflict. It marks it as "local change" and "remote change" inside the same text file. Then you can go into the note and delete or edit the part you don't need, that would work?

Eduard Metzger: that sounds good. that's what BBedit would do, put the docs side by side and highlight differences. It would need to show both directions, though: new things added in eg. green and old things deleted in eg. red. For caution, BBedit sometimes doesn't "see" blocks of similar lines, probably something that noteplan would not be able to avoid either. In such a case, I think it is most helpful if the colors remain during editing and one can just spot and delete duplicate lines by hand.

nopi: Yes that would be ideal, but very difficult to build without spending a lot of time on it. I was actually thinking of something simpler, reusing what's already out there (you could then potentially use another app to display the changes until NotePlan supports it). We leave everything as it is, but add a button to the conflict bar at the bottom "Keep Both". Then... *Small excursion into git* Git adds the following to your code: ``` <<<<<<< HEAD [Local changes] ======= [Synced changes] >>>>>>> branch-name ``` We don't have branches or similar, so it could just say: ``` <<<<<<< LOCAL [Your changes] ======= [Synced changes] >>>>>>> SYNCED ``` For example: ``` <<<<<<< LOCAL Describe the benfits. ======= Describe the use cases. >>>>>>> SYNCED ``` So in this case you know you have written "Describe the benefits" on this device and on another "Describe the use cases.". It was originally one line, but now you know which is which and can pick (i.e. you delete manually the one you don't need including the >>>>> markers). Of course, if we put in more time into this later of if you use another app to compare, it could visualize things better or even show a side-by-side view. Would this help? I like this solution, because it's easier to implement. But still got to check.

Eduard Metzger: For me, a "use this and keep both" or "use newer and keep both" button next to the "use this" would be enough. Then put the date and time from the red bar somewhere into the file that I didn't choose but wanted to keep. I would probably not attempt to choose one on the go or add what I'd need. When I have time, I'd put them side bu side and compare by eye. That would be a neat display for choosing a file later, so a "open conflicted files in split view" would be nice. (on the side - I'm a bit worried that all these extras will make noteplan slower, Is that so? Or is most slowness due to CloudKit?)

Eduard Metzger: sounds good to me. Particularly if there is a standard way of marking up the two different regions, so that advanced editors can pick it up and help the user find and resolve them.

nopi: I think the slowness might be due to the amount of notes you are using?

Jonathan Clark: The plugin works fine for cleanup, thanks!