Strange, I had no problem merging (the conflicts were mostly the underscore fixes, using incoming worked for me for all of them). Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Wednesday, August 05, 2009 11:22 AM Subject: Re: [Pharo-project] merging latest polymorph Ok I will try What I did was to click on all the use incoming version and at the end (at 5 left items) it just looped for ever. I had the redo the use incoming version but the number of conflicts stayed the same for ever 5. So far I could merge Polymorph-Widgets-gvc.70 but not Polymorph- Widgets-gvc.71 Stef On Aug 5, 2009, at 12:08 PM, Damien Cassou wrote:
On Wed, Aug 5, 2009 at 11:18 AM, Stéphane Ducasse<stephane.ducasse@inria.fr> wrote:
Hi adrian
I got some problems when merging the latest polymorph (_ fixes). I got conflicts when there should be none. I simply got revision changed. Did you already experience that?
You may want to try _loading_ again the version from the Pharo repository and then _merging_ with the other repository.
-- Damien Cassou http://damiencassou.seasidehosting.st
"Lambdas are relegated to relative obscurity until Java makes them popular by not having them." James Iry
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project