git:你的分支和'origin/master'有分歧 - 如何丢弃本地提交？

Question

我在git中有以下消息:

# 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)

我想丢弃3个本地提交,并在origin/master处提取8个远程提交.

(合并将变得非常困难,一旦掌握最新,我宁愿再次进行3次本地提交.)

我怎样才能做到这一点？

Answer 1

git fetch origin
git reset --hard origin/master

Answer 2

要在临时分支上保留旧提交,以备不时之需:

git branch temp

然后切换到新的主人

git fetch origin
git reset --hard origin/master

Answer 3

尝试这样做以破坏本地提交：

git reset --hard HEAD~4