解決沖突

• 人生不如意之事十之八九，合并分支往往也不是一帆風順的矛辕。
• 準備新的feature1分支笑跛，繼續(xù)我們的新分支開發(fā)：

$ 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(-)

• 現(xiàn)在飞蹂，master分支和feature1分支各自都分別有新的提交，變成了這樣：
• image
• 這種情況下翻屈，Git無法執(zhí)行“快速合并”陈哑，只能試圖把各自的修改合并起來，但這種合并就可能會有沖突，我們試試看：

$ 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的內(nèi)容：

it 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用<<<<<<<纠屋，=======，>>>>>>>標記出不同分支的內(nèi)容盾计，我們修改如下后保存：

Creating a new branch is quick and simple.

• 再提交：

$ git add readme.txt 
$ git commit -m "conflict fixed"
[master 59bc1cb] conflict fixed

• 現(xiàn)在售担，master分支和feature1分支變成了下圖所示：
• iamge
• 用帶參數(shù)的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命令可以看到分支合并圖哥攘。