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

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

git checkout feature
git rebase master