Git fetch和git pull的区别, 解决Git报错:error: You have not concluded your merge (MERGE_HEAD exists).

分手后的思念是犯贱 2022-04-12 11:17 134阅读 0赞

## **一、Git fetch和git pull的区别:** ##

### 都可以从远程获取最新版本到本地 ###

### **1.Git fetch:只是从远程获取最新版本到本地,不会`merge`(合并)** ###

git fetch origin master   //从远程的origin的master主分支上获取最新版本到origin/master分支上
    git log -p master..origin/master //比较本地的master分支和origin/master分支的区别
    git merge origin/master          //合并

### **2.Git pull:从远程获取最新版本并`merge`(合并)到本地** ###

git pull origin master  //相当于进行了 git fetch 和 git merge两部操作

实际工作中,可能`git fetch`**更好一些, 因为在**`merge`**前,可以根据实际情况决定是否**`merge`

--------------------

## 二、**报错:`error: You have not concluded your merge`** ##

## **再说导致报错:`error: You have not concluded your merge (MERGE_HEAD exists).`的原因可能是在以前pull下来的代码自动合并失败** ##

### **解决办法一:保留本地的更改,中止合并->重新合并->重新拉取** ###

git merge --abort
    git reset --merge
    git pull

### **解决办法二:舍弃本地代码,远端版本覆盖本地版本(慎重)** ###

git fetch --all
    git reset --hard origin/master
    git fetch

--------------------

参考以下链接:

[http://stackoverflow.com/questions/11646107/you-have-not-concluded-your-merge-merge-head-exists][http_stackoverflow.com_questions_11646107_you-have-not-concluded-your-merge-merge-head-exists]

[http://yijiebuyi.com/blog/5b55eb51ad49ce41e2de9c85dd4513ca.html][http_yijiebuyi.com_blog_5b55eb51ad49ce41e2de9c85dd4513ca.html]

[http://blog.csdn.net/hudashi/article/details/7664457][http_blog.csdn.net_hudashi_article_details_7664457]

[http_stackoverflow.com_questions_11646107_you-have-not-concluded-your-merge-merge-head-exists]: http://stackoverflow.com/questions/11646107/you-have-not-concluded-your-merge-merge-head-exists
[http_yijiebuyi.com_blog_5b55eb51ad49ce41e2de9c85dd4513ca.html]: http://yijiebuyi.com/blog/5b55eb51ad49ce41e2de9c85dd4513ca.html
[http_blog.csdn.net_hudashi_article_details_7664457]: http://blog.csdn.net/hudashi/article/details/7664457