解决冲突

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

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

  1. $ git switch -c feature1
  2. Switched to a new branch 'feature1'

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

  1. Creating a new branch is quick AND simple.

在feature1分支上提交：

  1. $ git add readme.txt
  3. $ git commit -m "AND simple"
  4. [feature1 14096d0] AND simple
  5.  1 file changed, 1 insertion(+), 1 deletion(-)

切换到master分支：

  1. $ git switch master
  2. Switched to branch 'master'
  3. Your branch is ahead of 'origin/master' by 1 commit.
  4.   (use "git push" to publish your local commits)

Git还会自动提示我们当前master分支比远程的master分支要超前1个提交。

在master分支上把readme.txt文件的最后一行改为：

  1. Creating a new branch is quick & simple.

提交：

  1. $ git add readme.txt 
  2. $ git commit -m "& simple"
  3. [master 5dc6824] & simple
  4.  1 file changed, 1 insertion(+), 1 deletion(-)

现在，master分支和feature1分支各自都分别有新的提交，变成了这样：

解决冲突 - 图1

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

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

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

  1. $ git status
  2. On branch master
  3. Your branch is ahead of 'origin/master' by 2 commits.
  4.   (use "git push" to publish your local commits)
  6. You have unmerged paths.
  7.   (fix conflicts and run "git commit")
  8.   (use "git merge --abort" to abort the merge)
  10. Unmerged paths:
  11.   (use "git add <file>..." to mark resolution)
  13.     both modified:   readme.txt
  15. no changes added to commit (use "git add" and/or "git commit -a")

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

  1. Git is a distributed version control system.
  2. Git is free software distributed under the GPL.
  3. Git has a mutable index called stage.
  4. Git tracks changes of files.
  5. <<<<<<< HEAD
  6. Creating a new branch is quick & simple.
  7. =======
  8. Creating a new branch is quick AND simple.
  9. >>>>>>> feature1

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

  1. Creating a new branch is quick and simple.

再提交：

  1. $ git add readme.txt 
  2. $ git commit -m "conflict fixed"
  3. [master cf810e4] conflict fixed

现在，master分支和feature1分支变成了下图所示：

解决冲突 - 图2

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

  1. $ git log --graph --pretty=oneline --abbrev-commit
  2. *   cf810e4 (HEAD -> master) conflict fixed
  3. |\  
  4. | * 14096d0 (feature1) AND simple
  5. * | 5dc6824 & simple
  6. |/  
  7. * b17d20e branch test
  8. * d46f35e (origin/master) remove test.txt
  9. * b84166e add test.txt
  10. * 519219b git tracks changes
  11. * e43a48b understand how stage works
  12. * 1094adb append GPL
  13. * e475afc add distributed
  14. * eaadf4e wrote a readme file

最后，删除feature1分支：

  1. $ git branch -d feature1
  2. Deleted branch feature1 (was 14096d0).

工作完成。

小结

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

解决冲突就是把Git合并失败的文件手动编辑为我们希望的内容，再提交。

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

读后有收获可以支付宝请作者喝咖啡：

解决冲突 - 图3