[squeak-dev] MethodReference>>category merge conflict

Levente Uzonyi leves at elte.hu
Sun Dec 20 18:13:29 UTC 2009


On Sun, 20 Dec 2009, Igor Stasenko wrote:

> Hello,
> i just pressed 'update' in trunk image and MC shows me a merge
> conflict of the above method.
> while trying to merge  Monticello-ar.336

I can happen depending on the state of your image. Keep the change and 
merge.


Levente

>
> -- 
> Best regards,
> Igor Stasenko AKA sig.
>
>



More information about the Squeak-dev mailing list