Please pardon the Merge dialog on your next update, select "Rest Accept".

Trunk update does a merge, simply reverting Installer-Core to this one will
clean out the old ancestor for you if it's bothersome.

Next release, we'll make some convenience upgrades to the tool, detect and
do this automatically, among some other things...


On Mon, Jan 6, 2020 at 6:58 PM <commits at source.squeak.org> wrote:

> Chris Muller uploaded a new version of Installer-Core to project The Trunk:
> http://source.squeak.org/trunk/Installer-Core-cmm.437.mcz
>
> ==================== Summary ====================
>
> Name: Installer-Core-cmm.437
> Author: cmm
> Time: 6 January 2020, 6:53:59.789216 pm
> UUID: e428617a-fa29-4bf5-9213-85a22994f447
> Ancestors: Installer-Core-mt.434
>
> Include package definitions for a GraphQL engine expected in Q1/2020.
>
> =============== Diff against Installer-Core-mt.434 ===============
>
> Item was added:
> + ----- Method: Installer>>graphQlEngine (in category
> 'package-definitions') -----
> + graphQlEngine
> +       ^ { #ss -> 'graphql'.
> +       'GraphQL-Core'.
> +       'GraphQL-Engine' }!
>
> Item was added:
> + ----- Method: Installer>>graphQlTestsEngine (in category
> 'package-definitions') -----
> + graphQlTestsEngine
> +       ^ { self graphQlEngine.
> +       'GraphQL-Tests-Core'.
> +       'GraphQL-Tests-Engine' }!
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20200106/e05f1b14/attachment.html>