On Tue, 12 May 2015, Bert Freudenberg wrote:

> (moving to squeak-dev)
>
> On 12.05.2015, at 03:54, Chris Muller <asqueaker at gmail.com> wrote:
>>
>> The update stream wasn't smooth for me because there were numerous
>> merge prompts where I wasn't sure whether I should "Keep Local" or
>> "Keep Remote".  I selected Local every time, is that right?
>
> No you want to “keep remote”, meaning you want the changes coming in from the new package to supersede the changes in your local image.

Chris is talking about the update of a Spur image, so - if I'm not 
mistaken - he has to reject all changes - aka "Keep Local" -, because 
those changes are from the non-spur branch (no idea how they get there) 
and try to revert some Spur-related changes (e.g. throwing away the 
minVal/maxVal class variables from SmallInteger).

Levente

>
> We wanted to give these buttons better labels for a long time.
>
> How about “keep my changes” vs “discard my changes”? And “keep all my changes” vs “discard all my changes” instead of “rest local/remote”?
>
> Some native speaker help us out, here ;)
>
> - Bert -
>
>