"Untracked working tree files" - 如何中止所有更改？

Question

基于这个答案，我尝试了以下命令的不同组合，最后我按此顺序尝试了所有命令：

sbees@STRIX-SCOTT D:pathtorepo
> git clean -f
sbees@STRIX-SCOTT D:pathtorepo
> git clean -fd
sbees@STRIX-SCOTT D:pathtorepo
> git reset
sbees@STRIX-SCOTT D:pathtorepo
> git checkout .

而且我仍然收到错误：

sbees@STRIX-SCOTT D:pathtorepo
> git pull
error: The following untracked working tree files would be overwritten by merge:
        MyProj.DynamicLoading/NetworkMessaging/NetworkMessaging.csproj
        MyProj.DynamicLoading/MyProj.DynamicLoading.Data.Objects/MyProj.DynamicLoading.Data.Objects.csproj
        MyProj.DynamicLoading/MyProj.DynamicLoading.Data/MyProj.DynamicLoading.Data.csproj
        MyProj.DynamicLoading/MyProj.DynamicLoading.sln
        MyProj.DynamicLoading/MyProj.DynamicLoading/MyProj.DynamicLoading.csproj
Please move or remove them before you merge.
Aborting
sbees@STRIX-SCOTT D:pathtorepo
>

我到底如何才能从远程分支更新项目并完全忽略我的所有本地更改？ 我现在应该刚刚删除并重新开始，但这是一个 8 GB 的项目，需要 5 个小时才能下载......

什么是魔法咒语？我需要找一只鸡吗？

---

sbees@STRIX-SCOTT D:project
> git reset --hard origin/master
Checking out files: 100% (1179/1179), done.
HEAD is now at ea4b3238 Merge remote-tracking branch 'origin/master'
sbees@STRIX-SCOTT D:project
> git pull
error: The following untracked working tree files would be overwritten by merge:
        Assets/AIBots/Man_Office_01/resources.meta
        Assets/AIBots/Man_Office_01/resources/Man_Office_01.fbm.meta
        Assets/AIBots/Man_Office_01/resources/Man_Office_01.fbm/Man_Office_01_Beard_diffuse.png
        Assets/AIBots/Man_Office_01/resources/Man_Office_01.fbm/Man_Office_01_Beard_diffuse.png.meta
        ... about a thousand more

Answer 1

你可以这样做：

$ git add .
$ git reset --hard HEAD

现在，尝试git pull

Answer 2

因此，

经过 1 小时的 git 命令，我下载了 Aurees Git 客户端，打开它，单击主屏幕上的橙色大"回滚更改"按钮，然后我就可以拉...