Posted by Andreas.Raab on Sep 26, 2006; 8:00pm
URL: https://forum.world.st/Latest-updates-on-CroquetSource-hedgehogRC-repository-tp129428p129434.html

Andreas Raab wrote:
> Ah, yes. If you have selectors displayed in bold it means you have
> conflicting changes and need to decide whether to "keep" the incoming
> change or to "reject" the incoming change (and I *hate* these terms, and
> hopefully I got them right this time).

Okay, and I just decided to fix it. If you update Monticello from the
homebase repository it will now read "keep local" and "keep remote"
which is hopefully more clear than "keep" and "reject".

Cheers,
   - Andreas