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

Levente Uzonyi leves at caesar.elte.hu
Thu Dec 30 09:06:27 UTC 2021


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.


Levente


More information about the Squeak-dev mailing list