<div dir="ltr">I know how to deal with the merge dialogs, it's not a problem *for me*. I know how to manually change the ancestry so it looks like a clean package again after merging. But not everybody does, and I wouldn't expect them to. The point of having a simple "update" button is that it pretty much "just works".<div><br></div><div>It it is a problem for someone downloading the release image and trying to switch to trunk. There shouldn't be any unnecessary merge dialogs.<div><br></div><div>(another problem is that in the release image not all packages are clean)<br><div><br></div><div><div>- Bert -</div><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Aug 24, 2016 at 1:50 PM, marcel.taeumel <span dir="ltr"><<a href="mailto:Marcel.Taeumel@hpi.de" target="_blank">Marcel.Taeumel@hpi.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">marcel.taeumel wrote<br>
<span class="">><br>
> Bert Freudenberg wrote<br>
>> ... shows lots of merge dialogs. We need to merge the 5.1 specific<br>
>> versions<br>
>> back into trunk, I guess?<br>
>><br>
>> - Bert -<br>
> I did copy some MCZ but made some other changes twice. No need to copy MCZ<br>
> at the moment. All changes in 5.1 are already in trunk. If in doubt, hit<br>
> "accept".<br>
><br>
> Best,<br>
> marcel<br>
<br>
</span>I double-checked. There were 3 merge dialogs for these three methods:<br>
<br>
ScrollBar >> #scrollPageInit:<br>
View >> #setDefaultBackgroundColor<br>
ReleaseBuilder class >> #initialize<br>
<br>
When converting a 5.1 image to Trunk, just accept the incoming changes.<br>
<br>
Best,<br>
Marcel<br>
<br>
<br>
<br>
--<br>
View this message in context: <a href="http://forum.world.st/Loading-trunk-updates-in-5-1-tp4912465p4912479.html" rel="noreferrer" target="_blank">http://forum.world.st/Loading-<wbr>trunk-updates-in-5-1-<wbr>tp4912465p4912479.html</a><br>
<div class="HOEnZb"><div class="h5">Sent from the Squeak - Dev mailing list archive at Nabble.com.<br>
<br>
</div></div></blockquote></div><br></div></div></div></div></div>