I am the only one that edit the notes. So I know when I changed what and thus perform push/pull in the correct order. It is very rare that I edit the same note on several devices at the same time.

I’m doing this about an intermediate step. My notes are all in a GIT repository. So I use GIT to create the synchronization between the different devices. On the smartphone with PuppyGit. Positive side effect: The note app itself does not require synchronization.