Smalltalk › Pharo › Pharo Smalltalk Developers

[update 2.0] #20491

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 3 messages Options
Torsten Bergmann
Reply | Threaded
Open this post in threaded view
♦
♦
|

[update 2.0] #20491

Torsten Bergmann
I get a merge problem (3 conflicts) when updating from a Pharo-20486.image:

KeyChain-StephaneDucasse.29
Stéphane Ducasse
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: [update 2.0] #20491

Stéphane Ducasse
Strange. I do not see why this can happen.

Stef

On Jan 26, 2013, at 12:25 PM, Torsten Bergmann wrote:

> I get a merge problem (3 conflicts) when updating from a Pharo-20486.image:
>
> KeyChain-StephaneDucasse.29


Stéphane Ducasse
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: [update 2.0] #20491

Stéphane Ducasse
In reply to this post by Torsten Bergmann
Torsten

I took the 20486 from the ci server and did an update and I got no problem at all.
So I have no idea from where the problem is coming.

Stef

On Jan 26, 2013, at 12:25 PM, Torsten Bergmann wrote:

> I get a merge problem (3 conflicts) when updating from a Pharo-20486.image:
>
> KeyChain-StephaneDucasse.29


Free forum by Nabble Edit this page