Note Studio

FAQ

There are two indicators:

The hot-sync manager will report that there was a problem during the sync. If you look at the hot-sync log you will see a message along the lines of 'Home Page (from book FileBook0007) was modified on Palm and PC 07/01/05 12:16:34', which would mean that the page called 'Home Page' in a particular book was modified in two locations.
You can see them in Note Studio itself. It's easier to see and resolve them on the Desktop, but you can also see them on the Palm version.

On the desktop, you can see them most clearly in the Navigator. There will be two pages containing special (green) text next to them. Going to either of those pages will display a header at the top of the page, indicating that there was a merge conflict. You can look at the two versions of the page, and decide which version to keep, and how to resolve the conflict.
On the handheld, you do not have a Navigator view. You only see the merge conflict by going to a conflicted page. You will see the header at the top of the page, which should link to the other version which was kept.