On Fri, Jul 22, 2022 at 07:38:07AM -0700, Eliot Miranda wrote:
> 
> 
> > On Jul 22, 2022, at 3:13 AM, Marcel Taeumel <marcel.taeumel at hpi.de> wrote:
> > 
> > ???
> > Hi Eliot --
> > 
> > > 1. the update fails with a merge conflict in the release builder between: [...]
> > 
> > If you want to prepare a VMMaker Trunk image, you would use a regular Trunk image, not a release image. I think. So, why aren't you using a recent 6.1alpha image?
> > -> http://files.squeak.org/6.1alpha/Squeak6.1alpha-22134-64bit/
> > 
> 
> OK, I???ll try that.  Thanx!!
> 

This will probably work with the 6.0 release image:

./Squeak.app/Contents/MacOS/Squeak trunk6-64.image UpdateSqueakTrunkImage.st --doit 'Project current addDeferredUIMessage: [PreferenceWizardMorph allInstances do: [:e | e delete]]'

Or maybe just add "PreferenceWizardMorph allInstances do: [:e | e delete]." as the first line of the script.


Dave