2013/7/29 Gael Varoquaux <[email protected]>: > On Mon, Jul 29, 2013 at 09:55:48AM +0200, Nelle Varoquaux wrote: >> How should we proceed for fixes that should go in 0.14 ? Merge in the 0.14 >> branch then cherrypick on master, or the other way around ? Or even regularly >> 0.14 in master ? > > Other way around: master first, and then 0.14. Remember: the buildbots > track master.
I think this how we did it for the past releases too. Checkin bugfixes and releases in master and then cherrypick fixes only to the release branch. -- Olivier http://twitter.com/ogrisel - http://github.com/ogrisel ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Scikit-learn-general mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/scikit-learn-general
