> > >> I recently did a merge between the pharo3.0 and the pharo4.0 branches of > AltBrowser; if you are interested, you can have a look and try to reproduce > it (by doing a checkout of the pharo4.0 branch to the commit id just before > the merge and merging with pharo3.0 again. Doing it with and without the > merge driver could be interesting). > > Keeping in sync your clone of AltBrowser with the fixes I push could be a > nice example as well. > > Thierry > > yeah more the reason to practice my merge skills. I had not the time to play with your browser yet, but I will and I am sure I will deal with these merge issues. Obviously if the merge driver is so needed makes sense to add it to a video tutorial but I will still like to streamline its installation to something easier, maybe I could help there if you dont beat me to the task first.
In any case I am very interested into contributing to improving the workflow between Pharo and Git.
