Would it be possible to enable "Keep current version" (ie, don't install the version from the thing being merged) to the menu list for New items in the Monticello merger? It's kind of hard to f.ex. merge Squeak-trunk Collections, containing Base64MimeConverter, when in Pharo, that Class exists in a different package. At least as far as I can tell (haven't actually done it, as I don't feel like resolving the 260 other conflicts just to find out), applying the merge will result in move the class. Alternatively to check if the item already exists in the system, but in a different package, and mark that as a conflict.
Cheers, Henry _______________________________________________ Pharo-project mailing list [email protected] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
