Moving master head to a branch

Question

I have several feature branches and a master branch. Feature2 is done. Normally I would rebase (working with a remote SVN repo and would like to keep the history, so no regular

Answer 1

You don't have to merge the branches, a reset is enough. Assuming master is checked out:

git reset --hard feature2