Git安装教程（三）分支管理之解决冲突

解决冲突

 

人生不如意之事十之八九，合并分支往往也不是一帆风顺的。

 

准备新的feature1分支，继续我们的新分支开发：

$ git checkout -b feature1
Switched to a new branch 'feature1'

修改readgit.txt最后一行，改为：

Creating a new branch is quick.
very good and abc
add a p and a

在feature1分支上提交：

$ git add readgit.txt

$ git commit -m "add a"
[feature1 ca273b5] add a
 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分支上把readgit.txt文件的最后一行改为：

Creating a new branch is quick.
very good and abc
add a p add b

提交：

$ git commit -m "add b"
[master 2fcc803] add b
 1 file changed, 1 insertion(+), 1 deletion(-)

这种情况下，Git无法执行“快速合并”，只能试图把各自的修改合并起来，但这种合并就可能会有冲突，我们试试看：

$ git merge feature1
Auto-merging readgit.txt
CONFLICT (content): Merge conflict in readgit.txt
Automatic merge failed; fix conflicts and then commit the result.

果然冲突了！Git告诉我们，readgit.txt文件存在冲突，必须手动解决冲突后再提交。git status也可以告诉我们冲突的文件：

$ git status
On branch master
Your branch is ahead of 'origin/master' by 6 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:   readgit.txt

我们可以直接查看readgit.txt的内容：

Creating a new branch is quick.
very good and abc
<<<<<<< HEAD
add a p add b
=======
add a p and a
>>>>>>> feature1

Git用<<<<<<<，=======，>>>>>>>标记出不同分支的内容，我们修改如下后保存：

Creating a new branch is quick.
very good and abc
add a p

再提交：

$ git add readgit.txt
$ git commit -m "conflict fixed"
[master 43fd2d3] conflict fixed

使用带参数的git log 可以看到分支合并情况

$ git log --graph --pretty=oneline --abbrev-commit

例如

*   43fd2d3 (HEAD -> master) conflict fixed
|\
| * ca273b5 (feature1) add a
* | 2fcc803 add b
|/
* 1736dac add p

最后，删除feature1分支：

$ git branch -d feature1
Deleted branch feature1 (was ca273b5).

当Git无法自动合并分支时，就必须首先解决冲突。解决冲突后，再提交，合并完成。

用git log --graph命令可以看到分支合并图。