I tried to load one by one the package and revert the conflicts when necessary. It somehow succeeded but now I have problem because the scriptLoader behavior does not work when trying to reload them. I have to investigate that further. I will have a look later.
Stef On Mar 21, 2009, at 1:46 PM, Stéphane Ducasse wrote: > Hi mike > > could you redo you system organization changes? > I checked with lukas we get a problem with the two merging tools :). > > Else what I can do is to keep track of the conflicts by hand (only a > few) and load then revert. > Because apparently MC does let me merge directly your changes. > > I can try to do the managing of your changes in late afternoon today. > After I really want to work on the closures (but I have some important > administration to do > by tomorrow). > > Stef > > _______________________________________________ > 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
