Is your feature request related to a problem? Please describe.
I'm always frustrated when there's a conflict on my notes. I guess things work fine if you are always online, but I my devices are not. For instance, I could be sitting on an airplane with my phone and my laptop, and take notes on them. Sometimes I fail to remember in which device I edited a note, which later provokes a conflict. The conflicts should be simple to solve, but they are not because I'm forced to choose one of the versions. What if I changed a sentence on one device, and added a new item at the bottom of the file on the other device?
Describe the solution you'd like
A simple to implement solution might be to allow editing the file in the conflict window. Then it would be easy to copy/paste from one version to the other. For extra points, it would be amazing to be able to click arrows to copy changed sections from one version to the other, like in Meld Merge https://meldmerge.org/
Describe alternatives you've considered
I can't currently think of alternatives. I was suggested to use Apple Notes which seems to be good at conflicts, but I'm not switching to iOS. Another alternative is to remember to not change a file in two devices while offline, but I fail to do this, and then I would need to write the note somewhere else and later add it, which is cumbersome.
Have you read the Longevity Statement?
I did.
Is your feature request related to a problem? Please describe.
I'm always frustrated when there's a conflict on my notes. I guess things work fine if you are always online, but I my devices are not. For instance, I could be sitting on an airplane with my phone and my laptop, and take notes on them. Sometimes I fail to remember in which device I edited a note, which later provokes a conflict. The conflicts should be simple to solve, but they are not because I'm forced to choose one of the versions. What if I changed a sentence on one device, and added a new item at the bottom of the file on the other device?
Describe the solution you'd like A simple to implement solution might be to allow editing the file in the conflict window. Then it would be easy to copy/paste from one version to the other. For extra points, it would be amazing to be able to click arrows to copy changed sections from one version to the other, like in Meld Merge https://meldmerge.org/
Describe alternatives you've considered I can't currently think of alternatives. I was suggested to use Apple Notes which seems to be good at conflicts, but I'm not switching to iOS. Another alternative is to remember to not change a file in two devices while offline, but I fail to do this, and then I would need to write the note somewhere else and later add it, which is cumbersome.
Additional context