论坛 › git/gitlab › git: Your branch and

lsdwyl 发表于 2018-1-13 14:28:11

git: Your branch and

　　git: Your branch and 'origin/master' have diverged - how to throw away local commits? - Stack Overflow
　　http://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 Overflow
　　http://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

查看完整版本: git: Your branch and