我试图从远程分支拉出更改,但得到一个没有意义的错误
当我做
git pull
我回来了
error: Your local changes to the following files would be overwritten by merge:
file/name/path
some/more/filenamepath
Please, commit your changes or stash them before you can merge.
Aborting
问题是我没有需要提交的更改
git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 7 different commits each, respectively.
#
nothing to commit (working directory clean)
there are no working changes
我试过了,git reset --hard HEAD但没有帮助
有任何想法吗？
文件位于NFS文件系统上,可能与文件系统有关.这是在OSX上
谢谢
更新:这个问题必须与NFS做一些事情,因为当我去原始源并从那里做git pull一切正常,它修复了这个实例,但仍然不确定它为什么导致NFS问题.