发生合并冲突以后 ~~~ Auto-merging test.txt CONFLICT (content): Merge conflict in test.txt Automatic merge failed; fix conflicts and then commit the result. ~~~ 首先查看有哪些冲突文件 ~~~ git status -s ~~~ <pre><span style='color:red'>UU</span> test.txt</pre> 然后打开冲突文件，并手动修改 ~~~ vi test.txt ~~~ ~~~ <<<<<<< HEAD runoob.com 新增加一行 ======= www.runoob.com >>>>>>> change_site ~~~ 修改完成后通过add命令告知git冲突已经解决并提交 ~~~ git add test.txt git commit -am '参数m是备注' ~~~