I have the following message in git:
# Your branch and \'origin/master\' have diverged, # and have 3 and 8 different commits each, respectively. # (use \"
Try doing this to blow away your local commits:
git reset --hard HEAD~4