人生不如意之事十之八九,合并分支往往也不是一帆風順的。
準備新的feature1分支,繼續我們的新分支開發:
$ git checkout -b feature1
Switched to a new branch 'feature1'
修改readme.txt最後一行,改為:
Creating a new branch is quick AND simple.
在feature1分支上送出:
$ git add readme.txt
$ git commit -m "AND simple"
[feature1 75a857c] AND simple
1 file changed, 1 insertion(+), 1 deletion(-)
切換到master分支:
$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 1 commit.
Git還會自動提示我們目前master分支比遠端的master分支要超前1個送出。
在master分支上把readme.txt檔案的最後一行改為:
Creating a new branch is quick & simple.
送出:
$ git add readme.txt
$ git commit -m "& simple"
[master 400b400] & simple
1 file changed, 1 insertion(+), 1 deletion(-)
現在,master分支和feature1分支各自都分别有新的送出,變成了這樣:
![](https://img.laitimes.com/img/9ZDMuAjOiMmIsIjOiQnIsIyZwpmLw8VNxIjN2YzM5UDMxQTMvwlbv1WbvN2LcNXZnFWbp9CXt92YuMjN0YTN24yYpRXY0N3Lc9CX6MHc0RHaiojIsJye.jpg)
這種情況下,Git無法執行“快速合并”,隻能試圖把各自的修改合并起來,但這種合并就可能會有沖突,我們試試看:
$ git merge feature1
Auto-merging readme.txt
CONFLICT (content): Merge conflict in readme.txt
Automatic merge failed; fix conflicts and then commit the result.
果然沖突了!Git告訴我們,readme.txt檔案存在沖突,必須手動解決沖突後再送出。git status也可以告訴我們沖突的檔案:
$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: readme.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
我們可以直接檢視readme.txt的内容:
Git is a distributed version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
<<<<<<< HEAD
Creating a new branch is quick & simple.
=======
Creating a new branch is quick AND simple.
>>>>>>> feature1
Git用<<<<<<<,=======,>>>>>>>标記出不同分支的内容,我們修改如下後儲存:
Creating a new branch is quick and simple.
再送出:
$ git add readme.txt
$ git commit -m "conflict fixed"
[master 59bc1cb] conflict fixed
現在,master分支和feature1分支變成了下圖所示:
![](https://img.laitimes.com/img/9ZDMuAjOiMmIsIjOiQnIsIyZwpmLw8VNxIjN2YzM5UDMxQTMvwlbv1WbvN2LcNXZnFWbp9CXt92YuMjN0YTN24yYpRXY0N3Lc9CX6MHc0RHaiojIsJye.jpg)
用帶參數的git log也可以看到分支的合并情況:
$ git log --graph --pretty=oneline --abbrev-commit
* 59bc1cb conflict fixed
|\
| * 75a857c AND simple
* | 400b400 & simple
|/
* fec145a branch test
...
現在,删除feature1分支:
$ git branch -d feature1
Deleted branch feature1 (was 75a857c).
工作完成。
小結
當Git無法自動合并分支時,就必須首先解決沖突。解決沖突後,再送出,合并完成。
用git log --graph指令可以看到分支合并圖。
熬夜不易,點選請老王喝杯烈酒!!!!!!!