[squeak-dev] Unexpected merge conflict for postscripts in the update stream

Marcel Taeumel marcel.taeumel at hpi.de
Thu Dec 30 09:20:19 UTC 2021

Hi all --

Sure. Then, why is our CI able to update from 19432 (~April 2020) to 20916 (today) without merge conflicts in postscripts so far? I suspect that Christoph might have had an uncommited changed postscript in his local image?

Am 30.12.2021 10:06:37 schrieb Levente Uzonyi <leves at caesar.elte.hu>:
Hi Marcel,

On Wed, 29 Dec 2021, Marcel Taeumel wrote:

> I hope there wouldn't be a conflict if the update map would have been updated for the changed postscript? In that case: Thanks for this tip! I will try to either only append stuff to the postscript or update the update map if
> I also remove stuff. Well, can the merger actually merge append-only things?

Appending stuff to the scripts is bad practice because the whole block
will be evaluated every time. And most of the time those scripts are
intended to be run only once.

However, there should always be a new update map when a script is changed.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20211230/a556c649/attachment.html>

More information about the Squeak-dev mailing list