无论何时我尝试在Git中进行push操作,我都会得到以下信息:
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
运行 git status
我得到以下结果:
# On branch master
nothing to commit (working directory clean)
当我运行git ls-files -u
时,我什么也没得到。
运行git add .
然后再试也没有任何区别。
出了什么问题?