最简单的方法是:

git pull --rebase --autostash

. gitignore

“向.gitignore添加不需要的文件，只要你最初没有将它们提交给任何分支。”

你也可以运行:

git update-index --assume-unchanged filename

https://chamindac.blogspot.com/2017/07/ignoring-visual-studio-2017-created.html

我通常这样做:

git checkout .
git pull

在项目的根文件夹中。

对我来说，以下方法是有效的:

(1)首先获取所有更改:

$ git fetch --all

(2)然后重置主机:

$ git reset --hard origin/master

注:对于github的用户，“master”在2020年10月被“main”取代。对于之后创建的项目，你可能需要使用“main”来代替，比如:

$ git reset --hard origin/main

(3)拉/更新:

$ 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'

查看git stash，将所有本地更改放入“stash文件”，并恢复到上次提交。此时，您可以应用您所存储的更改，或者丢弃它们。