git: Your branch and 'origin/master' have diverged - how to throw away local commits?

Question

I have the following message in git:

# Your branch and \'origin/master\' have diverged,
# and have 3 and 8 different commits each, respectively.
#   (use \"         


        

Answer 1

git fetch origin
git reset --hard origin/master

Answer 2

Try doing this to blow away your local commits:

git reset --hard HEAD~4

Answer 3

To erase your latest local commit use the following:

git reset HEAD^

This will get the header back to the state previous to the commit, and will allow you to git pull from master. Make sure you save all your changes elsewhere (locally) before pulling from the remote repository.

To be able to pull without conflicts use git stash, and then git pull.

Answer 4

If a hard reset doesn't cut it for you and you don't want to do a pull-merge you can throw away your local unwanted changes by deleting your local branch and re-download the origin one:

git branch -D <local branch>
git checkout -b <branch name> origin/<branch name>

Using master as an example:

git branch -D master
git checkout -b master origin/master

Answer 5

To preserve your old commits on a temporary branch in case you need them:

git branch temp

Then switch to the new master

git fetch origin
git reset --hard origin/master

Answer 6

As an alternative to merging, you can rebase the feature branch onto master branch using the following commands:

git checkout feature
git rebase master