Hi Christoph,
yes we consider meta information like categories as editions and thus
conflicts, and IMO it's a good thing because categories bring a bit of
added value that we don't want to lose.
A pity that I didn't see that those methods were miss-categorized,
maybe it's not visually obvious when using message tracer...

Le sam. 1 mai 2021 à 14:00, Christoph Thiede
<christoph.thiede at student.hpi.uni-potsdam.de> a écrit :
>
> 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. :-)
>
> Best,
> Christoph
>
>
>
> -----
> Carpe Squeak!
> --
> Sent from: http://forum.world.st/Squeak-Dev-f45488.html
>