准备新的feature1分支，继续我们的新分支开发
[root@node1 git]# git checkout -b feature1
D git/LICENSE.txt
Switched to a new branch 'feature1'
修改readme.txt最后一行，改为
Creating a new branch is quick AND simple.
在feature1分支上提交
[root@node1 git]# git commit -m "AND simple"
[feature1 b9dc73f] AND simple
file changed, insertion(+), deletion(-)
切换到master分支
[root@node1 git]# git checkout master
D git/LICENSE.txt
Switched to branch 'master'
Your branch is ahead of 'origin/master' by commit.
(use "git push" to publish your local commits)
Git还会自动提示我们当前master分支比远程的master分支要超前1个提交。
在master分支上把readme.txt文件的最后一行改为
Creating a new branch is quick & simple.
提交
[root@node1 git]# git add readme.txt
[root@node1 git]# git commit -m "& simple"
[master 051826e] & simple
file changed, insertion(+), deletion(-)
现在，master分支和feature1分支各自都分别有新的提交，变成了这样
这种情况下，Git无法执行“快速合并”，只能试图把各自的修改合并起来，但这种合并就可能会有冲突，我们试试看
[root@node1 git]# git merge feature1
Auto-merging git/readme.txt
CONFLICT (content): Merge conflict in git/readme.txt
Automatic merge failed; fix conflicts and then commit the result.
果然冲突了！Git告诉我们，readme.txt文件存在冲突，必须手动解决冲突后再提交。git status也可以告诉我们冲突的文件
[root@node1 git]# git status
# On branch master
# Your branch is ahead of 'origin/master' by 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的内容
[root@node1 git]# cat 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 fiels.
My stupid boss still prefers SVN
<<<<<<< HEAD
Creating a new branch is quick & simple.
=======
Creating a new branch is quick ADD simple.
>>>>>>> feature1
Git用<<<<<<<，=======，>>>>>>>标记出不同分支的内容，我们修改如下后保存
Creating a new branch is quick and simple
再提交
[root@node1 git]# git add readme.txt
[root@node1 git]# git commit -m "conflict fixed"
[master 59bc1cb] conflict fixed
现在，master分支和feature1分支变成了下图所示：
带参数的git log也可以看到分支的合并情况
[root@node1 git]# git log --graph --pretty=oneline --abbrev-commit
* 59bc1cb conflict fixed
|\
| * 75a857c AND simple
* | 400b400 & simple
|/
* fec145a branch test
...
最后，删除feature1分支
[root@node1 git]# git branch -d feature1
Deleted branch feature1 (was 75a857c)
工作完成。
小结
当Git无法自动合并分支时，就必须首先解决冲突。解决冲突后，再提交，合并完成。
用git log --graph命令可以看到分支合并图