[squeak-dev] Re: Loading trunk updates in 5.1

marcel.taeumel Marcel.Taeumel at hpi.de
Wed Aug 24 11:50:38 UTC 2016


marcel.taeumel wrote
> 
> Bert Freudenberg wrote
>> ... shows lots of merge dialogs. We need to merge the 5.1 specific
>> versions
>> back into trunk, I guess?
>> 
>> - Bert -
> I did copy some MCZ but made some other changes twice. No need to copy MCZ
> at the moment. All changes in 5.1 are already in trunk. If in doubt, hit
> "accept".
> 
> Best,
> marcel

I double-checked. There were 3 merge dialogs for these three methods:

ScrollBar >> #scrollPageInit: 
View >> #setDefaultBackgroundColor
ReleaseBuilder class >> #initialize

When converting a 5.1 image to Trunk, just accept the incoming changes.

Best,
Marcel



--
View this message in context: http://forum.world.st/Loading-trunk-updates-in-5-1-tp4912465p4912479.html
Sent from the Squeak - Dev mailing list archive at Nabble.com.


More information about the Squeak-dev mailing list