Mike, I'm getting confused about branch merge strategy. Usually, it seems that it has been to periodically merge the maintenance branch into master. Something like this:
git fetch upstream git checkout master git merge --ff-only upstream/master git merge upstream/v1.2.x # test, commit changes if necessary git push upstream master Is that correct? At present, however, we seem to be developing fairly long separate threads on the two branches, with duplicate changesets, presumably from cherry-picking. Is this intentional? Do you plan to go back to the merge strategy? I can see that a problem with branch merging is that there are occasionally changesets in v1.2.x, such as the rc version tagging, that are not appropriate for master. Eric ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://ad.doubleclick.net/clk;258768047;13503038;j? http://info.appdynamics.com/FreeJavaPerformanceDownload.html _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
