Jed Brown <jedbrown at mcs.anl.gov> writes: > == Users == > > I have rewound the branch 'next' after the release, so it will > not fast-forward (just this once). If you have a local 'next' branch, > you should abandon it and check out a fresh one. You can do this with > > $ git checkout master > $ git branch -D next # delete the old branch > $ git pull > $ git checkout next # revisit 'next' if you want
If you forget to do the above, you will see something like this the next time you switch to 'next': $ git checkout next Switched to branch 'next' Your branch and 'origin/next' have diverged, and have 324 and 30 different commits each, respectively. In this case, one command will get you onto the new 'next': $ git reset --hard origin/next
