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

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 
git checkout -b  origin/

Using master as an example:

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