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

Jakob Reschke jakres+squeak at gmail.com
Wed Dec 29 21:11:24 UTC 2021


Am Mi., 29. Dez. 2021 um 22:01 Uhr schrieb Marcel Taeumel
<marcel.taeumel at hpi.de>:
> Well, can the merger actually merge append-only things?

Text merge cannot tell automatically which of two or more additions at
the end must come first. And to conclude "it does not matter" it would
need domain knowledge about these scripts. I see no such knowledge in

Kind regards,

More information about the Squeak-dev mailing list