当前位置:   article > 正文

You have not concluded your merge(MERGE HEAD exists).hint: Please, commit your changes befo_you have not concluded your merge (merge_head exis

you have not concluded your merge (merge_head exists). hint: please, commit

git代码提交、推送报错

1. You have not concluded your merge(MERGE HEAD exists).hint: Please, commit your changes beforemerging.Exiting because of unfinished merge

2. error: You have not concluded your merge (MERGE_HEAD exists).

3. Cannot check the working tree for unmerg!files because of an error…

问题出现的原因:

1. 代码冲突!,未合并完代码就退出了(提交并推送)。

2.代码未更新就改了同一个文件同一行。

解决方案

1.终止合并git merge --abort

在这里插入图片描述

2.恢复合并git reset --merge ,重新拉取代码。git pull

如果到这里还没解决的话

那就看看有没有提交代码未推送出去的,撤回提交,再推送,撤回之前记得备份一份自己写的代码。

在这里插入图片描述

声明:本文内容由网友自发贡献,不代表【wpsshop博客】立场,版权归原作者所有,本站不承担相应法律责任。如您发现有侵权的内容,请联系我们。转载请注明出处:https://www.wpsshop.cn/w/小丑西瓜9/article/detail/495632
推荐阅读
相关标签
  

闽ICP备14008679号