Posted by Bert Freudenberg on Sep 26, 2006; 9:46pm
URL: https://forum.world.st/Latest-updates-on-CroquetSource-hedgehogRC-repository-tp129428p129430.html


Am 26.09.2006 um 21:00 schrieb Andreas Raab:

> 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".

Uh oh ... renaming the buttons is fine, but I strongly advocate  
against changing their order. Muscle memory, you know?

Also "choose remote" and "keep local" might be even clearer. Or  
simply "use remote" and "use local"? Anyway, the "remote" and "local"  
terms are much better than before.

- Bert -