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

准备新的feature1分支,继续我们的新分支开发:

  1. $ git checkout -b 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
  2. $ git commit -m "AND simple"
  3. [feature1 75a857c] AND simple
  4. 1 file changed, 1 insertion(+), 1 deletion(-)

切换到master分支:

  1. $ git checkout master
  2. Switched to branch 'master'
  3. Your branch is ahead of 'origin/master' by 1 commit.

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 400b400] & simple
  4. 1 file changed, 1 insertion(+), 1 deletion(-)

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

git-br-feature1

这种情况下,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. #
  5. # Unmerged paths:
  6. # (use "git add/rm <file>..." as appropriate to mark resolution)
  7. #
  8. # both modified: readme.txt
  9. #
  10. 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 59bc1cb] conflict fixed

现在,master分支和feature1分支变成了下图所示:

git-br-conflict-merged

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

  1. $ git log --graph --pretty=oneline --abbrev-commit
  2. * 59bc1cb conflict fixed
  3. |\
  4. | * 75a857c AND simple
  5. * | 400b400 & simple
  6. |/
  7. * fec145a branch test
  8. ...

最后,删除feature1分支:

  1. $ git branch -d feature1
  2. Deleted branch feature1 (was 75a857c).

工作完成。

小结

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

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

原文:https://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000/001375840202368c74be33fbd884e71b570f2cc3c0d1dcf000