遇到问题-----git-----You have not concluded your merge (MERGE_HEAD exists) git拉取失败
来源:互联网 发布:vb程序设计 编辑:程序博客网 时间:2024/06/05 07:23
今天获取git线上仓库代码报了这个错误:
zhangzhi@moke:~/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一份代码,抛弃这个工作目录
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)
- GIT PULL 报错 :You have not concluded your merge (MERGE_HEAD exists).
- 解决Git报错:error: You have not concluded your merge (MERGE_HEAD exists).
- Git fetch和git pull的区别, 解决Git报错:error: You have not concluded your merge (MERGE_HEAD exists).
- Git fetch和git pull的区别, 解决Git报错:error: You have not concluded your merge (MERGE_HEAD exists).
- You have not concluded your merge. (MERGE_HEAD exists)。
- windows7驱动开发配置
- gdb常用命令
- window.location.reload();页面实现跳转和刷新
- Streaming Data Processing_01
- 移动app增量升级测试需注意的问题
- 遇到问题-----git-----You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- RxJava 源码解读分析 just
- 编写stream minidriver
- DDMS不显示文件树
- svn 上传ios @2x图片时出错
- 推荐系统架构
- IoT (Internet of Things)资源汇总
- 算法作业_20(2017.5.4第十一周)
- 禅道-从windows7迁移至ubuntu14.04之一