You have not concluded your merge (MERGE

今天获取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

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

然后在获取线上仓库

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

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

git fetch --all

git reset --hard origin/master

git fetch

You have not concluded your merge (MERGE_HEAD exis相关推荐

git: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)
Git提交报错:error:You have not concluded your merge (MERGE_HEAD exists) 原因:pull下来的以前代码自动合并失败解决方法一:保留本地 ...
You have not concluded your merge (MERGE_HEAD exists) git拉取失败
本文转自:http://yijiebuyi.com/blog/5b55eb51ad49ce41e2de9c85dd4513ca.html 今天获取git线上仓库代码报了这个错误: zhangzhi@m ...
git pull指令报错：error: You have not concluded your merge (MERGE_HEAD exists).
使用git pull 指令时报错:error: You have not concluded your merge (MERGE_HEAD exists). 直接翻译上面的报错信息可知: 错误:您尚未 ...
Git常用命令、及常见报错处理：You have not concluded your merge (MERGE_HEAD exists)
一.常用命令切换到master分支:git checkout master 查看已有本地及远程分支:git branch -a(先git pull拉下全部数据) 查看远程分支:git branch ...
解决Git报错:error: You have not concluded your merge (MERGE_HEAD exists).
Git 解决Git报错:error: You have not concluded your merge (MERGE_HEAD exists). 开发新业务,拉取代码时,路由文件发生冲突,解决此文件 ...
解决Git报错:error: You have not concluded your merge (MERGE_HEAD exists)
Git fetch和git pull的区别: 都可以从远程获取最新版本到本地 1.Git fetch:只是从远程获取最新版本到本地,不会merge(合并) $:git fetch origin mas ...
git拉取报错：You have not concluded your merge. (MERGE_HEAD exists)
You have not concluded your merge. (MERGE_HEAD exists) 原因一般出现这种情况是没有完成上次的merge操作,就进行了pull操作,就会报这种错误 ...
【GitHub报错】You have not concluded your merge (MERGE_HEAD exists).解决方法
git push出现错误: You have not concluded your merge (MERGE_HEAD exists). 原因可能是在以前pull下来的代码自动合并失败. 方法一:保留 ...
【git】You have not concluded your merge (MERGE_HEAD exists).
error: You have not concluded your merge (MERGE_HEAD exists). 原因:pull下来的代码没有自动合并导致的.或是在以前pull下来的代码自动 ...

You have not concluded your merge (MERGE_HEAD exis

You have not concluded your merge (MERGE_HEAD exis相关推荐

最新文章

热门文章