TortoiseGit 将干净的目录显示为冲突
我正在使用 TortoiseGit 在 Windows 中管理一个 git 存储库。显示修改和 diff 显示工作目录和头之间没有差异。然而，我的一个文件夹上出现了一个红色的小 X。
有没有办法重置TortoiseGit的状态？是否存在我看不到的差异？
I have a git repository that I'm working on which I am using TortoiseGit to manage in Windows. Show modifications and diff show that there are no differences between working directory and head. However, a little red X shows up over one of my folders.
Is there a way to reset the status of TortoiseGit? Are there differences I can't see?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
假设这不是 Tortoise Git 中的错误——我不使用它，所以我对它了解不多——这取决于最近发生的事情。我认为最有可能的情况是您在变基期间遇到合并冲突并且忘记完成变基。如果是这种情况，您需要以一种或另一种方式完成变基：
git rebase --abort或git rebase --continue。git status会给你一个线索。如果它显示您不在分支上，但您希望在分支上，那么您可能正处于变基过程中。编辑：这个人声称它是Windows 中的 TortoiseGit 缓存有问题。尝试终止 TGitCache.exe 进程并重新启动资源管理器。我记得以前在 TortoiseSVN 中遇到过这样的问题......
Assuming it's not a bug in Tortoise Git--I don't use it, so I don't know much about it--it depends what happened most recently. I think the most likely situation is that you ran into a merge conflict during a rebase and forgot to finish the rebase. If that's the case, you need to complete the rebase one way or another:
git rebase --abortorgit rebase --continue. Agit statuswill give you a clue. If it shows that you're not on a branch, but you expect to be, then you're probably in the middle of a rebase.Edit: This guy claims it's a problem with the TortoiseGit cache in Windows. Try killing the TGitCache.exe process and restarting explorer. I remember a problem like this in TortoiseSVN back in the day...
关闭所有资源管理器窗口（目录窗口）
打开进程资源管理器：按名称排序。找到 TgitCache.exe。
单击它并按“结束进程”按钮。
重新打开资源管理器，瞧。
Close all Explorer windows (directory windows)
Open Process explorer: Sort by name. Find TGitCache.exe.
Click on it and press the END PROCESS button.
Reopen the explorer and voilla.