git 教程(14)--解决冲突
人生不如意之事十之八九,合并分支往往也不是一帆风顺的。
准备新的feature1
分支,继续我们的新分支开发:
修改readme.txt最后一行,改为:
Creating a new branch is quick AND simple.
在feature1
分支上提交:
切换到master
分支:
Git还会自动提示我们当前master
分支比远程的master
分支要超前1个提交。(我的没有这个哎。。。。。。。。。。。???)
在master
分支上把readme.txt文件的最后一行改为:
Creating a new branch is quick & simple.
提交
现在,master
分支和feature1
分支各自都分别有新的提交,变成了这样
这种情况下,Git无法执行“快速合并”,只能试图把各自的修改合并起来,但这种合并就可能会有冲突,我们试试看:
果然冲突了!Git告诉我们,readme.txt文件存在冲突,必须手动解决冲突后再提交。git status
也可以告诉我们冲突的文件:
![](data:image/png;base64,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)
我们可以直接查看readme.txt的内容:
Git用<<<<<<<
,=======
,>>>>>>>
标记出不同分支的内容,我们修改如下后保存:
Creating a new branch is quick and simple
再提交:
现在,master
分支和feature1
分支变成了下图所示:
用带参数的git log
也可以看到分支的合并情况
最后,删除feature1
分支:
小结
当Git无法自动合并分支时,就必须首先解决冲突。解决冲突后,再提交,合并完成。
用git log --graph
命令可以看到分支合并图。