如果你使用的是Linux:

git fetch
for file in `git diff origin/master..HEAD --name-only`; do rm -f "$file"; done
git pull

for循环将删除所有在本地回购中更改的跟踪文件，因此git pull将正常工作。 关于这一点最好的事情是，只有被跟踪的文件将被repo中的文件覆盖，所有其他文件将保持不变。

我通常这样做:

git checkout .
git pull

在项目的根文件夹中。

下面的命令不会总是工作。如果你这样做了:

$ git checkout thebranch
Already on 'thebranch'
Your branch and 'origin/thebranch' have diverged,
and have 23 and 7 different commits each, respectively.

$ git reset --hard
HEAD is now at b05f611 Here the commit message bla, bla

$ git pull
Auto-merging thefile1.c
CONFLICT (content): Merge conflict in thefile1.c
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.

等等……

要真正从头开始，下载分支并覆盖所有本地更改，只需执行:

$ git checkout thebranch
$ git reset --hard origin/thebranch

这就可以了。

$ git checkout thebranch
Already on 'thebranch'
Your branch and 'origin/thebranch' have diverged,
and have 23 and 7 different commits each, respectively.

$ git reset --hard origin/thebranch
HEAD is now at 7639058 Here commit message again...

$ git status
# On branch thebranch
nothing to commit (working directory clean)

$ git checkout thebranch
Already on 'thebranch'

这将获取当前分支并尝试快速跳转到master:

git fetch && git merge --ff-only origin/master

如果你使用的是Linux:

git fetch
for file in `git diff origin/master..HEAD --name-only`; do rm -f "$file"; done
git pull

for循环将删除所有在本地回购中更改的跟踪文件，因此git pull将正常工作。 关于这一点最好的事情是，只有被跟踪的文件将被repo中的文件覆盖，所有其他文件将保持不变。

这对我很有效

git fetch --all
git reset --hard origin/master
git pull origin master

对于接受的答案，我会得到冲突错误