<div dir="ltr"><div>What about:</div>'Skip' 'leave method in image untouched'<div>'Load' 'load method from file'</div><div><br></div><div>and </div><div><br></div><div>'Skip all' 'leave all methods in image untouched'</div><div>'Load all' 'load all methods from file'</div><div><br></div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 12, 2015 at 12:23 PM, Bert Freudenberg <span dir="ltr"><<a href="mailto:bert@freudenbergs.de" target="_blank">bert@freudenbergs.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">(moving to squeak-dev)<br>
<br>
On 12.05.2015, at 03:54, Chris Muller <<a href="mailto:asqueaker@gmail.com">asqueaker@gmail.com</a>> wrote:<br>
><br>
> The update stream wasn't smooth for me because there were numerous<br>
> merge prompts where I wasn't sure whether I should "Keep Local" or<br>
> "Keep Remote". I selected Local every time, is that right?<br>
<br>
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.<br>
<br>
We wanted to give these buttons better labels for a long time.<br>
<br>
How about “keep my changes” vs “discard my changes”? And “keep all my changes” vs “discard all my changes” instead of “rest local/remote”?<br>
<br>
Some native speaker help us out, here ;)<br>
<span class="HOEnZb"><font color="#888888"><br>
- Bert -<br>
<br>
</font></span><br><br>
<br></blockquote></div><br></div>