2014-06-05 15:28 GMT+02:00 Lars Buitinck <larsm...@gmail.com>: > 2014-06-05 15:24 GMT+02:00 Olivier Grisel <olivier.gri...@ensta.org>: >> I don't think this is possible and this is not what we did for >> previous releases: > > It's certainly possible, git merge --strategy=ours does a "null" merge > where the result is just the state of master. The question is whether > we want this; it might make diff/log against released versions easier.
I don't know either, but anyway we can always do the null merge afterwards. The question is more in the even we start having release specific changes to the website such as some done in: https://github.com/scikit-learn/scikit-learn/commit/9cf67f961e3d0b493f432df0201d91bd0a7dcedf if we later want to add a bugfix to that branch to re-release (e.g. 0.15.1 and so on) we won't be able to merge the bugfixes from the 0.15.X branch to master. We will have to cherry pick bugfix commits and avoid commit that are related to release specific stuff. -- Olivier ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/NeoTech _______________________________________________ Scikit-learn-general mailing list Scikit-learn-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/scikit-learn-general
