[Moose-dev] Re: Moving to GIT?

Le 07/04/2015 17:08, Anne Etien a écrit : Well, I'll let you judge of the complexity. For Serge effort in the Datathon in Paris/Montreuil, I wanted to merge Sven improvements on Open Street Map in Roassal to Alexandre latest Roassal2. Sven did it during PharoDays, so, when was that? Two months ago? So I fired up Monticello, opened the Smalltalkhub repository, and tried merging Roassal2-AlexandreBergel.812 and Roassal2-SvenVanCaenberghe.720. Should have been easy, no? Sven only modified two or three methods, added a class, that's all. Result: 282 conflicts... Spread over all of Roassal2, touching almost all classes :( You couldn't even find the true modifications of Sven in all that mess. So what I did is switch to git. Copy via gitfiletree the common ancestor of Roassal2 (.718), made a branch Sven-OSM and copied there Sven's .719 and .720 versions, moved back to master and copied there the latest Roassal2 (.812), and: git merge Sven-OSM Without counting the fact that git is a lot faster going through Roassal code than Monticello is. You have a point. Now, after looking at the way some (many) of the projects are using Monticello, Metacello (Configurations), I'm not sure waiting for that GUI is a wise decision. Thierry