On Mar 3, 2004, at 12:45 PM, Julian Fitzell wrote:

> Those buttons won't do anything unless there's a conflict.  Conflicts 
> are indicated by rows in the changes list marked in bold.  If you 
> click on a bold row, you have the choice to keep or reject the 
> incoming version of the change.

Also note that recent changes in 3.7 prevent the bold items from 
actually being bold, so you have to kind of guess where they are. Ned 
posted a fix for this, but AFAIK it hasn't been approved yet.

This isn't a problem in 3.6.

Colin