Re: [Scikit-learn-general] branch 0.17.X reset

2015-11-01 Thread Andy
On 10/31/2015 01:41 PM, Gael Varoquaux wrote: > > Why didn't you use "git revert" rather than rewriting history? > > Thanks for working on the release, by the way! > I didn't think it mattered for a branch no-one was using, and it is already a bit hard to keep track of what is happening in the rel

Re: [Scikit-learn-general] branch 0.17.X reset

2015-10-31 Thread Gael Varoquaux
Why didn't you use "git revert" rather than rewriting history? Thanks for working on the release, by the way! Gaƫl Sent from my phone. Please forgive brevity and mis spelling On Oct 31, 2015, 17:10, at 17:10, Andy wrote: >Hey. >Just in case anyone was working on 0.17.X for some reason: >I ne

[Scikit-learn-general] branch 0.17.X reset

2015-10-31 Thread Andy
Hey. Just in case anyone was working on 0.17.X for some reason: I needed to remove a commit that was accidentally cherrypicked. So if you have a 0.17.X branch you need to update it to the rebased master: git fetch uptream && git checkout 0.17.X && git reset --hard upstream/0.17.X Cheers, Andy -