文章目录
解决冲突
人生不如意之事十之八九，合并分支往往也不是一帆风顺的。
准备新的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 019672b] 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.
(use "git push" to publish your local commits)
Git还会自动提示我们当前master分支比远程的master分支要超前1个提交。
在master分支上把readme.txt文件的最后一行改为：
Creating a new branch is quick & simple.
提交：
$ git add readme.txt
$ git commit -m "& simple"
[master cdd45fe] & simple
1 file changed, 1 insertion(+), 1 deletion(-)
现在，master分支和feature1分支各自都分别有新的提交，变成了这样：
这种情况下，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.
(use "git push" to publish your local commits)
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." 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.
<<<<<<< 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 519b239] conflict fixed
现在，master分支和feature1分支变成了下图所示：
用带参数的git log也可以看到分支的合并情况：
git log 命令列出历史提交记录
$ git log
commit 519b239a8d5f92e219b2842aef12c5481b1d4e62
Merge: cdd45fe 019672b
Author: lixiaowei <944932343@qq.com>
Date: Tue Jan 8 11:04:52 2019 +0800
conflict fixed
commit cdd45fedeb9af7414debb139df24360f5ab61d7a
Author: lixiaowei <944932343@qq.com>
Date: Tue Jan 8 10:41:24 2019 +0800
& simple
commit 019672b19fa94bdaaa161f7fefe91e859935aecd
Author: lixiaowei <944932343@qq.com>
Date: Tue Jan 8 10:34:29 2019 +0800
AND simple
commit 6637024a3ac80c736bf637946f1016f75c748363
Author: lixiaowei <944932343@qq.com>
Date: Mon Jan 7 18:24:03 2019 +0800
git log --oneline 查看历史记录的简洁的版本
$ git log --oneline
519b239 conflict fixed
cdd45fe & simple
019672b AND simple
6637024 branch test
27470e0 First Commit
edf0b59 Initial commit
git log --graph命令可以看到分支合并图
$ git log --graph
* commit 519b239a8d5f92e219b2842aef12c5481b1d4e62
|\ Merge: cdd45fe 019672b
| | Author: lixiaowei <944932343@qq.com>
| | Date: Tue Jan 8 11:04:52 2019 +0800
| |
| | conflict fixed
| |
| * commit 019672b19fa94bdaaa161f7fefe91e859935aecd
| | Author: lixiaowei <944932343@qq.com>
| | Date: Tue Jan 8 10:34:29 2019 +0800
| |
| | AND simple
| |
* | commit cdd45fedeb9af7414debb139df24360f5ab61d7a
|/ Author: lixiaowei <944932343@qq.com>
| Date: Tue Jan 8 10:41:24 2019 +0800
|
| & simple
|
* commit 6637024a3ac80c736bf637946f1016f75c748363
| Author: lixiaowei <944932343@qq.com>
| Date: Mon Jan 7 18:24:03 2019 +0800
加上--abbrev-commit：仅显示SHA-1的前几个字符，而非所有的40个字符
$ git log --graph --pretty=oneline --abbrev-commit
* 519b239 conflict fixed
|\
| * 019672b AND simple
* | cdd45fe & simple
|/
* 6637024 branch test
* 27470e0 First Commit
* edf0b59 Initial commit
最后，删除feature1分支：
$ git branch -d feature1
Deleted branch feature1 (was 019672b).
小结
当Git无法自动合并分支时，就必须首先解决冲突。解决冲突后，再提交，合并完成。
解决冲突就是把Git合并失败的文件手动编辑为我们希望的内容，再提交。
git log 命令列出历史提交记录
git log --oneline 查看历史记录的简洁的版本
git log --graph命令可以看到分支合并图
参数 --abbrev-commit：仅显示SHA-1的前几个字符，而非所有的40个字符
