如何做正確的git合併/拉：你還沒有結束你的合併（MERGE_HEAD存在）

Question

我是Git的新手，並且無法理解如何使用Git。我一直在使用CVS，所以通過一些Git的學習曲線。這裏是我所有嘗試的

現在我只更改了兩個文件PromoServiceImpl.java和build.sql。然而，融合問題已經從「產品」分支變成了現實。

您看到的剩餘文件（如ApiServiceImpl.java等）是來自其他用戶的更改，但我不確定此處的表示是否表明我已更改它們。 Prob它在早期的拉命令期間被合併，現在它期望我提交它們？

不管什麼是（甚至在某些谷歌搜索）我遵守命令的流量我看到以下錯誤：

You have not concluded your merge (MERGE_HEAD exists) Please, commit your changes before you can merge.

這裏是我遵循和輸出的命令序列（試圖使它漂亮通過插入新行以供大家閱讀）。即使在重新從庫中進行修改之後，這個錯誤也會回來，所以我確信我在做一些錯誤的事情，而不是使用git的一些問題。

kamal@kamal-Lenovo-G470:~/git/TryGit$ gs 
# On branch product 
# Your branch is ahead of 'origin/product' by 1 commit. 
# 
# Changes not staged for commit: 
# (use "git add <file>..." to update what will be committed) 
# (use "git checkout -- <file>..." to discard changes in working directory) 
# 
# modified: TryGitServices/src/main/java/com/TryGit/services/promo/impl/PromoServiceImpl.java 
# 
# Untracked files: 
# (use "git add <file>..." to include in what will be committed) 
# 
# Adding 
no changes added to commit (use "git add" and/or "git commit -a") 


kamal@kamal-Lenovo-G470:~/git/TryGit$ git pull origin product 
From ssh://192.168.2.251/TryGit 
* branch   product -> FETCH_HEAD 
Auto-merging TryGitResources/build/build.sql 
CONFLICT (content): Merge conflict in TryGitResources/build/build.sql 
Automatic merge failed; fix conflicts and then commit the result. 


kamal@kamal-Lenovo-G470:~/git/TryGit$ gs 
# On branch product 
# Your branch is ahead of 'origin/product' by 1 commit. 
# 
# Changes to be committed: 
# 
# modified: TryGitCore/src/main/java/com/TryGit/core/api/binding.xml 
# modified: TryGitServices/src/main/java/com/TryGit/services/api/impl/ApiServiceImpl.java 
# modified: TryGitServices/src/main/java/com/TryGit/services/common/impl/StartupServiceImpl.java 
# modified: TryGitWeb/src/main/webapp/WEB-INF/wsdl/TryGit.wsdl 
# modified: TryGitWeb/src/main/webapp/static/css/TryGit/homeDeal.css 
# modified: TryGitWeb/src/main/webapp/static/css/TryGit/TryGit.css 
# modified: TryGitWeb/src/main/webapp/static/img/TryGit/sprite/TryGit.png 
# modified: TryGitWeb/src/main/webapp/views/admin/createPromoCode.jsp 
# modified: TryGitWeb/src/main/webapp/views/admin/product/productAdmin.jsp 
# modified: TryGitWeb/src/main/webapp/views/deal/homePage.jsp 

# 
# Unmerged paths: 
# (use "git add/rm <file>..." as appropriate to mark resolution) 
# 
# both modified:  TryGitResources/build/build.sql 
# 
# Changes not staged for commit: 
# (use "git add <file>..." to update what will be committed) 
# (use "git checkout -- <file>..." to discard changes in working directory) 
# 
# modified: TryGitServices/src/main/java/com/TryGit/services/promo/impl/PromoServiceImpl.java 
# 
# Untracked files: 
# (use "git add <file>..." to include in what will be committed) 
# 
# Adding 


kamal@kamal-Lenovo-G470:~/git/TryGit$ git reset TryGitResources/build/build.sql 
Unstaged changes after reset: 
M TryGitResources/build/build.sql 
M TryGitServices/src/main/java/com/TryGit/services/promo/impl/PromoServiceImpl.java 
kamal@kamal-Lenovo-G470:~/git/TryGit$ gs 
# On branch product 
# Your branch is ahead of 'origin/product' by 1 commit. 
# 
# Changes to be committed: 
# 
# modified: TryGitCore/src/main/java/com/TryGit/core/api/binding.xml 
# modified: TryGitResources/build/build.sql 
# modified: TryGitServices/src/main/java/com/TryGit/services/api/impl/ApiServiceImpl.java 
# modified: TryGitServices/src/main/java/com/TryGit/services/common/impl/StartupServiceImpl.java 
# modified: TryGitWeb/src/main/webapp/WEB-INF/wsdl/TryGit.wsdl 
# modified: TryGitWeb/src/main/webapp/static/css/TryGit/homeDeal.css 
# modified: TryGitWeb/src/main/webapp/static/css/TryGit/TryGit.css 
# modified: TryGitWeb/src/main/webapp/static/img/TryGit/sprite/TryGit.png 
# modified: TryGitWeb/src/main/webapp/views/admin/createPromoCode.jsp 
# modified: TryGitWeb/src/main/webapp/views/admin/product/productAdmin.jsp 
# modified: TryGitWeb/src/main/webapp/views/deal/homePage.jsp 
# 
# Changes not staged for commit: 
# (use "git add <file>..." to update what will be committed) 
# (use "git checkout -- <file>..." to discard changes in working directory) 
# 
# modified: TryGitResources/build/build.sql 
# modified: TryGitServices/src/main/java/com/TryGit/services/promo/impl/PromoServiceImpl.java 
# 
# Untracked files: 
# (use "git add <file>..." to include in what will be committed) 
# 
# Adding 


kamal@kamal-Lenovo-G470:~/git/TryGit$ git stash 
Saved working directory and index state WIP on product: b8bb080 changing build.sql for RBT task 
HEAD is now at b8bb080 changing build.sql for RBT task 


kamal@kamal-Lenovo-G470:~/git/TryGit$ gs 
# On branch product 
# Your branch is ahead of 'origin/product' by 1 commit. 
# 
# Untracked files: 
# (use "git add <file>..." to include in what will be committed) 
# 
# Adding 
nothing added to commit but untracked files present (use "git add" to track) 


kamal@kamal-Lenovo-G470:~/git/TryGit$ git reset Adding 


kamal@kamal-Lenovo-G470:~/git/TryGit$ git reset Adding 


kamal@kamal-Lenovo-G470:~/git/TryGit$ gs 
# On branch product 
# Your branch is ahead of 'origin/product' by 1 commit. 
# 
# Untracked files: 
# (use "git add <file>..." to include in what will be committed) 
# 
# Adding 
nothing added to commit but untracked files present (use "git add" to track) 

kamal@kamal-Lenovo-G470:~/git/TryGit$ git rm Adding 
fatal: pathspec 'Adding' did not match any files 

kamal@kamal-Lenovo-G470:~/git/TryGit$ man git rm 

kamal@kamal-Lenovo-G470:~/git/TryGit$ git rm Adding 
fatal: pathspec 'Adding' did not match any files 

kamal@kamal-Lenovo-G470:~/git/TryGit$ gs 
# On branch product 
# Your branch is ahead of 'origin/product' by 1 commit. 
# 
# Untracked files: 
# (use "git add <file>..." to include in what will be committed) 
# 
# Adding 
nothing added to commit but untracked files present (use "git add" to track) 

kamal@kamal-Lenovo-G470:~/git/TryGit$ git pull origin product 
remote: Counting objects: 566, done. 
remote: Compressing objects: 100% (316/316), done. 
remote: Total 386 (delta 207), reused 0 (delta 0) 
Receiving objects: 100% (386/386), 203.81 KiB, done. 
Resolving deltas: 100% (207/207), completed with 56 local objects. 
From ssh://192.168.2.251/TryGit 
* branch   product -> FETCH_HEAD 
Auto-merging TryGitResources/build/build.sql 
CONFLICT (content): Merge conflict in TryGitResources/build/build.sql 
Automatic merge failed; fix conflicts and then commit the result. 

kamal@kamal-Lenovo-G470:~/git/TryGit$ git pull origin product 
M TryGitCore/src/main/java/com/TryGit/core/api/binding.xml 
U TryGitResources/build/build.sql 
M TryGitServices/src/main/java/com/TryGit/services/api/impl/ApiServiceImpl.java 
M TryGitServices/src/main/java/com/TryGit/services/common/impl/StartupServiceImpl.java 
M TryGitWeb/src/main/webapp/WEB-INF/wsdl/TryGit.wsdl 
M TryGitWeb/src/main/webapp/static/css/TryGit/homeDeal.css 
M TryGitWeb/src/main/webapp/static/css/TryGit/TryGit.css 
M TryGitWeb/src/main/webapp/static/img/TryGit/sprite/TryGit.png 
M TryGitWeb/src/main/webapp/views/admin/createPromoCode.jsp 
M TryGitWeb/src/main/webapp/views/admin/product/productAdmin.jsp 
M TryGitWeb/src/main/webapp/views/deal/homePage.jsp 
Pull is not possible because you have unmerged files. 
Please, fix them up in the work tree, and then use 'git add/rm <file>' 
as appropriate to mark resolution, or use 'git commit -a'. 

kamal@kamal-Lenovo-G470:~/git/TryGit$ git add TryGitResources/build/build.sql 
kamal@kamal-Lenovo-G470:~/git/TryGit$ git pull origin product 
You have not concluded your merge (MERGE_HEAD exists). 
Please, commit your changes before you can merge. 
kamal@kamal-Lenovo-G470:~/git/TryGit$ gs 
# On branch product 
# Your branch is ahead of 'origin/product' by 1 commit. 
# 
# Changes to be committed: 
# 
# modified: TryGitCore/src/main/java/com/TryGit/core/api/binding.xml 
# modified: TryGitResources/build/build.sql 
# modified: TryGitServices/src/main/java/com/TryGit/services/api/impl/ApiServiceImpl.java 
# modified: TryGitServices/src/main/java/com/TryGit/services/common/impl/StartupServiceImpl.java 
# modified: TryGitWeb/src/main/webapp/WEB-INF/wsdl/TryGit.wsdl 
# modified: TryGitWeb/src/main/webapp/static/css/TryGit/homeDeal.css 
# modified: TryGitWeb/src/main/webapp/static/css/TryGit/TryGit.css 
# modified: TryGitWeb/src/main/webapp/static/img/TryGit/sprite/TryGit.png 
# modified: TryGitWeb/src/main/webapp/views/admin/createPromoCode.jsp 
# modified: TryGitWeb/src/main/webapp/views/admin/product/productAdmin.jsp 
# modified: TryGitWeb/src/main/webapp/views/deal/homePage.jsp 

# 
# Untracked files: 
# (use "git add <file>..." to include in what will be committed) 
# 
# Adding 

kamal@kamal-Lenovo-G470:~/git/TryGit$ git pull origin product 
You have not concluded your merge (MERGE_HEAD exists). 
Please, commit your changes before you can merge. 

kamal@kamal-Lenovo-G470:~/git/TryGit$ 

Answer 1

這裏有幾件事情正在進行。它有助於理解發布各種Git命令時會發生什麼。

pull的命令（如在git pull）results in一個後跟一個mergefetch。所以，當你做了pull

kamal@kamal-Lenovo-G470:~/git/TryGit$ git pull origin product 

的Git試圖從默認的遠程倉庫

From ssh://192.168.2.251/TryGit 
* branch   product -> FETCH_HEAD 

的變更，併合並他們。

Auto-merging TryGitResources/build/build.sql 

在這樣做時，遇到衝突

CONFLICT (content): Merge conflict in TryGitResources/build/build.sql 
Automatic merge failed; fix conflicts and then commit the result. 

Git maintains this 3 versions的文件正在等待合併 - 您的更改，拉入的變化和共同的祖先。拉入的版本暫時存儲在MERGE_HEAD中。

您可以看到與git diff調用的不同之處。此時您需要修復Git無法自動解決的衝突。修好後，只需執行通常的git add，然後再執行git commit。該過程也在commit命令的手冊頁的示例部分中進行了說明。

哦！看起來你有一個文件叫Adding。需要注意的是git status命令

# Untracked files: 
# (use "git add <file>..." to include in what will be committed) 
# 
# Adding 

發生這種情況時，你問的Git跟蹤目錄（例如，當你做了git init .）結束。從那時起，Git監視指定位置的更改。上面說的是「我看到你添加了一個名爲Adding的文件，我對它沒有太多瞭解（它沒有被跟蹤）。「一旦你添加它，混帳開始跟蹤的變化（可以告訴你什麼已經隨着時間的推移它改變）