You have not concluded your merge (MERGE_HEAD exists) git拉取失败
来源:互联网 发布:音频分类算法 编辑:程序博客网 时间:2024/05/29 02:19
今天获取git线上仓库代码报了这个错误:
zhangzhi@moke:~/code/ktsg-api$ git pullYou have not concluded your merge (MERGE_HEAD exists).Please, commit your changes before you can merge.
错误可能是因为在你以前pull下来的代码没有自动合并导致的.
有2个解决办法:
1.保留你本地的修改
git merge --abortgit reset --merge
合并后记得一定要提交这个本地的合并
然后在获取线上仓库
git pull
2.down下线上代码版本,抛弃本地的修改
不建议这样做,但是如果你本地修改不大,或者自己有一份备份留存,可以直接用线上最新版本覆盖到本地
git fetch --allgit reset --hard origin/mastergit fetch
当然还有一个最笨的方法,就是重新clone一份代码,抛弃这个工作目录,哈哈,开玩笑.
原文出自:飞扬的博客
0 0
- 遇到问题-----git-----You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- 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).git拉取失败
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- Git You have not concluded your merge. (MERGE_HEAD exists)
- (git)You have not concluded your merge (MERGE_HEAD exists).
- git问题:You 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)
- You have not concluded your merge (MERGE_HEAD exists)
- You have not concluded your merge (MERGE_HEAD exists)
- RHEL/Centos7 安装图形化桌面
- [POJ2407] Relatives
- 轻松理解 Java开发中的依赖注入(DI)和控制反转(IOC)
- Neo4j介绍与安装
- Neural Networks for Applied Sciences and Engineering--Chapter 2
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- 编程珠玑记录(一)
- 乘法表
- String类浅析
- 京东快报效果
- Android Aligned Unaligned Apk
- 方便自己记忆
- Android Studio添加注释模板
- DNS隧道和ICMP隧道