ou have not concluded your merge (MERGE_HEAD exists)

Posted blogcxz

tags:

篇首语:本文由小常识网(cha138.com)小编为大家整理,主要介绍了ou have not concluded your merge (MERGE_HEAD exists)相关的知识,希望对你有一定的参考价值。

今天获取git线上仓库代码报了这个错误:

[email protected]:~/code/ktsg-api$ git pull
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.

  

 错误可能是因为在你以前pull下来的代码没有自动合并导致的.

有2个解决办法:

1.保留你本地的修改

git merge --abort

git reset --merge

合并后记得一定要提交这个本地的合并

然后在获取线上仓库

git pull

 

2.down下线上代码版本,抛弃本地的修改

不建议这样做,但是如果你本地修改不大,或者自己有一份备份留存,可以直接用线上最新版本覆盖到本地

git fetch --all

git reset --hard origin/master

git fetch

 

当然还有一个最笨的方法,就是重新clone一份代码,抛弃这个工作目录

以上是关于ou have not concluded your merge (MERGE_HEAD exists)的主要内容,如果未能解决你的问题,请参考以下文章

git pull 报错 You have not concluded your merge (MERGE_HEAD exists).

You have not concluded your merge. (MERGE_HEAD exists)(转)

You have not concluded your merge. (MERGE_HEAD exists)。(转)

You have not concluded your merge. (MERGE_HEAD exists)。(转)

Git提示You have not concluded your merge. (MERGE_HEAD exists)

解决Git报错:error: You have not concluded your merge (MERGE_HEAD exists).