[squeak-dev] False merge conflicts

Christoph Thiede christoph.thiede at student.hpi.uni-potsdam.de
Sat May 1 12:00:44 UTC 2021

Nevermind, this one was a false alert, though it took me way too much to
realize this. In my image, I already had recategorized this method, but in
the Trunk, it is still uncategorized. Thus the merge conflict. :-)


Carpe Squeak!
Sent from: http://forum.world.st/Squeak-Dev-f45488.html

More information about the Squeak-dev mailing list