Note Studio
FAQ
When I synched I got told there was a merge conflict. What is that?
A merge conflict happens when you modify the same object in two places, without synching.
Ordinarily, you make changes on one device or the other between hot-synchs. This is easy for the conduit to handle. For example,
when it finds a page which was modified on the Palm but not on the Desktop, it will see that the Palm version is more recent,
and will overwrite the Desktop version with the Palm copy.
However, if it finds a page which has been modified on both devices, it does not know how to resolve this. Some possible solutions
would be:
- one version arbitrarily overwrites the other (resulting in one version being lost)
- a clever merge scheme which merges the pages together, so both versions are effectively kept
- keep both versions.
If you have any experience with Source Control programs, you might think that the merge scheme would be best, but it is not
possible when merging encrypted pages, and there are other problems. So the Note Studio conduit does the third option - the
most conservative option - it keeps both versions of the page.
When you have a merge conflict, you will find two pages with almost the identical name. It is up to you to manually decide
which version you will keep, and delete the other page (copying any changes from it first, if they are important).