当我们的分支与master的提交发生冲突的时候,应当解决冲突,再提交git
比如我们新建一个分支point,对point的文件进行修改提交,再切换至master也进行修改提交,这时候合并两个分支的时候就会发生冲突,应该对冲突文件进行修改再commit
git branch -b point
git checkout point
vi readme.txt
this branch is point.
git add readme.txt
git commit -m "branch point"
git checkout master
vi readme.txt
this branch is master.
git add readme.txt
git commit -m "branch master"
git merge point
[errors]:
CONFLICT (content): Merge conflict in readme.txt
Automatic merge failed; fix conflicts and then commit the result.
vi readme.txt
this branch is fixed.
git add readme.txt
git commit -m "branch fixed"
git branch -d point
在这里要注意的是,版本控制对面文本文件最有效,而binary文件merge时总是直接覆盖。