Note Studio
FAQ
What do I do when I see a merge conflict?
You should resolve it, then sync again, as soon as is practicable.
To resolve it, decide which of the two versions of the page is going to be the 'correct' version. Then paste any changes from
the 'incorrect' version that you want to keep. Then remove the 'incorrect' version.
The 'correct' page will be flagged as being conflicted until you edit it. As soon as you edit it, it is assumed to be fixed,
and the flag is cleared.
When you synch to the other device, these changes should be reflected at the other end.