search

hpi-swa-lab / SqueakByExample-english

An introductory book about the Squeak/Smalltalk programming system, guiding students and developers through the environment, language, tools, and the Morphic framework by means of a series of examples and exercises.
https://www.lulu.com/shop/patrick-rein-and-christoph-thiede/squeak-by-example-60/paperback/product-8vr2j2.html
Other
25 stars 7 forks source link

Fix recent merge incidents #39

Closed LinqLover closed 3 years ago

LinqLover commented 3 years ago

I'm sorry for the inconveniences, somehow the recent Pull Requests have introduced conflicts with each other. On GitLab, there are "Merge trains" to avoid such a situation, but GitHub appears to lack such a feature ...

LinqLover commented 3 years ago

@codeZeilen Sorry for the red master. I should not have merged all pull requests at the same time ... Could you approve this again, please? :-)