On Tue, Jan 17, 2012 at 7:48 PM, MinRK <benjaminrk@gmail.com> wrote:
> Hello,
>>> A bad commit snuck into IPython master that had to be removed,
> requiring a rebase and force push. So if you have been tracking
> IPython master, your next update may require something more forceful
> than `git pull`. If your git pull fails, the two-step 'force pull'
> is:
>> git fetch origin
> git reset origin/master --hard
Just a heads up: this command will permanently clear all uncommitted
changes to tracked files. You should make sure that your working
directory is clean first (git status), and if it is not, you should
commit the changes or use something like git stash to save them.
Also, this may go without saying, but for those not so good at git, I
should note that before running the above two commands, you should
make sure that you are in the master branch (git checkout master).
Aaron Meurer