On Tue, 12 May 2015, David T. Lewis wrote:

> On Tue, May 12, 2015 at 12:23:12PM +0200, 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.
>>
>> 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 ;)
>>
>
> +1
>
> "keep my changes" and "discard my changes" sounds good to me, and is
> easier for me to understand.

That sounds misleading to me, because it's possible that those changes are 
not my changes at all, but different versions of the same method from two 
branches.

Levente

>
> Dave
>
>
>