[squeak-dev] Keep Local vs Keep Remote when merging

Chris Muller asqueaker at gmail.com
Tue May 12 18:34:39 UTC 2015


+1

And, it would really be nice to have the ability to edit the method
right there in case a manual integration is needed, otherwise you have
to remember..

On Tue, May 12, 2015 at 5:41 AM, karl ramberg <karlramberg at gmail.com> wrote:
> What about:
> 'Skip'  'leave method in image untouched'
> 'Load' 'load method from file'
>
> and
>
> 'Skip all' 'leave all methods in image untouched'
> 'Load all' 'load all methods from file'
>
>
>
> On Tue, May 12, 2015 at 12:23 PM, Bert Freudenberg <bert at freudenbergs.de>
> 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 ;)
>>
>> - Bert -
>>
>>
>>
>>
>
>
>
>


More information about the Squeak-dev mailing list