人生不如意之事十之八九，合并分支往往也不是一帆風順的。
準備新的feature1分支，繼續我們的新分支開發：
|
1
2
|
$ git checkout -b feature1Switched to a new branch 'feature1' |
修改readme.txt最后一行，改為：
|
1
|
Creating a new branch is quick AND simple. |
在feature1分支上提交：
|
1
2
3
4
|
$ git add readme.txt $ git commit -m "AND simple"[feature1 75a857c] AND simple 1 file changed, 1 insertion(+), 1 deletion(-) |
切換到master分支：
|
1
2
3
|
$ git checkout masterSwitched to branch 'master'Your branch is ahead of 'origin/master' by 1 commit. |
Git還會自動提示我們當前master分支比遠程的master分支要超前1個提交。
在master分支上把readme.txt文件的最后一行改為：
|
1
|
Creating a new branch is quick & simple. |
提交：
|
1
2
3
4
|
$ git add readme.txt $ git commit -m "& simple"[master 400b400] & simple 1 file changed, 1 insertion(+), 1 deletion(-) |
現在，master分支和feature1分支各自都分別有新的提交，變成了這樣：
這種情況下，Git無法執行“快速合并”，只能試圖把各自的修改合并起來，但這種合并就可能會有沖突，我們試試看：
|
1
2
3
4
|
$ git merge feature1Auto-merging readme.txtCONFLICT (content): Merge conflict in readme.txtAutomatic merge failed; fix conflicts and then commit the result. |
果然沖突了！Git告訴我們，readme.txt文件存在沖突，必須手動解決沖突后再提交。git status也可以告訴我們沖突的文件：
|
1
2
3
4
5
6
7
8
9
10
|
$ 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的內容：
|
1
2
3
4
5
6
7
8
9
|
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.<<<<<<< HEADCreating a new branch is quick & simple.=======Creating a new branch is quick AND simple.>>>>>>> feature1 |
Git用<<<<<<<，=======，>>>>>>>標記出不同分支的內容，我們修改如下后保存：
|
1
|
Creating a new branch is quick and simple. |
再提交：
|
1
2
3
|
$ git add readme.txt $ git commit -m "conflict fixed"[master 59bc1cb] conflict fixed |
現在，master分支和feature1分支變成了下圖所示：
用帶參數的git log也可以看到分支的合并情況：
|
1
2
3
4
5
6
7
8
|
$ git log --graph --pretty=oneline --abbrev-commit* 59bc1cb conflict fixed|\| * 75a857c AND simple* | 400b400 & simple|/* fec145a branch test... |
最后，刪除feature1分支：
|
1
2
|
$ git branch -d feature1Deleted branch feature1 (was 75a857c). |
工作完成。
