fatal: You have not concluded your merge (MERGE_HEAD exists).
来源:互联网 发布:2016淘宝年会 马云 编辑:程序博客网 时间:2024/06/05 02:18
背景:
用git提交的时候,commit之后提示一个致命错误:“fatal: You have not concluded yourmerge (MERGE_HEAD exists).”
这是因为: 以前的pull之后merge失败, git进入conflict状态。也就是说你以前pull下来的代码没有自动合并导致的
有两个解决办法:
1) 保留本地的修改
git merge --abort
git reset --merge
合并后记得一定要提交这个本地的合并
然后在获取线上仓库
git pull
2)down下线上代码版本,抛弃本地的修改
不建议这样做,但是如果你本地修改不大,或者自己有一份备份留存,可以直接用线上最新版本覆盖到本地
git fetch --all
git reset --hard origin/master
git fetch
阅读全文
0 0
- fatal: 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)
- You have not concluded your merge (MERGE_HEAD exists)
- (git)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)
- Error merging: fatal: You have not concluded your merge (MERGE_HEAD exists).
- You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can me
- 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 PULL 报错 :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) git拉取失败
- 1001. 害死人不偿命的(3n+1)猜想 (15)
- CF77C Beavermuncher-0xFF(树形dp)
- hadoop 集群配置入门
- moudule.js:338 throw err; Error: Cannot find module 'webpack/lib/node/NodeTemplatePlugin'
- cocos2dx中lambda表达式几种用法的初步总结
- fatal: You have not concluded your merge (MERGE_HEAD exists).
- Java Security Architecture--Java安全体系技术文档翻译(一)
- 书写简介规范的代码(一)
- Python lxml模块安装教程
- 10.25.2017 考试总结与解题报告
- 关于大小端模式的说明
- web应用的组成结构
- 1002. 写出这个数 (20)
- Post 和 Get 那些事