git: Your branch and 'origin/master' have diverged

git: Your branch and 'origin/master' have diverged

git: Your branch and 'origin/master' have diverged - how to throw away local commits? - Stack Overflowhttp://stackoverflow.com/questions/19864934/git-your-branch-and-origin-master-have-diverged-how-to-throw-away-local-com

git: Your branch and 'origin/master' have diverged - how to throw away local commits - Stack Overflowhttp://stackoverflow.com/questions/32630379/git-your-branch-and-origin-master-have-diverged-how-to-throw-away-local-com

Question:

# Your branch and 'origin/master' have diverged,

# and have 3 and 8 different commits each, respectively.

# (use "git pull" to merge the remote branch into yours)

Resolve:

git fetch origin

git reset --hard origin/master

Your branch and 'origin / processos_criminais_151029' have diverged

git fetch origin

git reset --hard origin/processos_criminais_151029

查看原文