<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body>
<style type="text/css" style="display:none;"><!-- P {margin-top:0;margin-bottom:0;} --></style>
<div id="divtagdefaultwrapper" style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr">
<p>> <span style="font-size: 12pt;">Next release, we'll make some convenience upgrades to the tool, detect and do this automatically, among some other things...</span></p>
<div><br>
</div>
<div>Great to hear this! I often get an empty merge dialog; this could be simply detected.</div>
<div><br>
</div>
<div>Best,</div>
<div>Christoph</div>
<p></p>
<div id="Signature">
<div id="divtagdefaultwrapper" dir="ltr" style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, EmojiFont, "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;">
<div name="divtagdefaultwrapper" style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:; margin:0">
<div><font size="2" color="#808080"></font></div>
</div>
</div>
</div>
</div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>Von:</b> Squeak-dev <squeak-dev-bounces@lists.squeakfoundation.org> im Auftrag von Chris Muller <asqueaker@gmail.com><br>
<b>Gesendet:</b> Dienstag, 7. Januar 2020 02:09:05<br>
<b>An:</b> squeak dev<br>
<b>Cc:</b> packages@lists.squeakfoundation.org<br>
<b>Betreff:</b> Re: [squeak-dev] The Trunk: Installer-Core-cmm.437.mcz</font>
<div> </div>
</div>
<div>
<div dir="ltr">
<div>Please pardon the Merge dialog on your next update, select "Rest Accept".</div>
<div><br>
</div>
<div>Trunk update does a merge, simply reverting Installer-Core to this one will clean out the old ancestor for you if it's bothersome.</div>
<div><br>
</div>
<div>Next release, we'll make some convenience upgrades to the tool, detect and do this automatically, among some other things...</div>
<div><br>
</div>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Mon, Jan 6, 2020 at 6:58 PM <<a href="mailto:commits@source.squeak.org" target="_blank">commits@source.squeak.org</a>> wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Chris Muller uploaded a new version of Installer-Core to project The Trunk:<br>
<a href="http://source.squeak.org/trunk/Installer-Core-cmm.437.mcz" rel="noreferrer" target="_blank">http://source.squeak.org/trunk/Installer-Core-cmm.437.mcz</a><br>
<br>
==================== Summary ====================<br>
<br>
Name: Installer-Core-cmm.437<br>
Author: cmm<br>
Time: 6 January 2020, 6:53:59.789216 pm<br>
UUID: e428617a-fa29-4bf5-9213-85a22994f447<br>
Ancestors: Installer-Core-mt.434<br>
<br>
Include package definitions for a GraphQL engine expected in Q1/2020.<br>
<br>
=============== Diff against Installer-Core-mt.434 ===============<br>
<br>
Item was added:<br>
+ ----- Method: Installer>>graphQlEngine (in category 'package-definitions') -----<br>
+ graphQlEngine<br>
+ ^ { #ss -> 'graphql'.<br>
+ 'GraphQL-Core'.<br>
+ 'GraphQL-Engine' }!<br>
<br>
Item was added:<br>
+ ----- Method: Installer>>graphQlTestsEngine (in category 'package-definitions') -----<br>
+ graphQlTestsEngine<br>
+ ^ { self graphQlEngine.<br>
+ 'GraphQL-Tests-Core'.<br>
+ 'GraphQL-Tests-Engine' }!<br>
<br>
<br>
</blockquote>
</div>
</div>
</body>
</html>