git版本管理系列(九)

git版本管理系列(八)

推送冲突的解决

创建新分支

nelsen-mac:learngit mac$ git checkout -b f1
Switched to a new branch 'f1'

修改文件readme.md，并且commit 到本地仓库

nelsen-mac:learngit mac$ git add readme.md 
nelsen-mac:learngit mac$ git commit -m'create a conflict'

切换到master分支，修改readme.md文件

nelsen-mac:learngit mac$ git checkout master

然后提交修改 

nelsen-mac:learngit mac$ git commit -m'conflict is coming'

 合并f1分支，提示我们发生了冲突

nelsen-mac:learngit mac$ git merge f1
Auto-merging readme.md
CONFLICT (content): Merge conflict in readme.md
Automatic merge failed; fix conflicts and then commit the result.

<<<<<<< HEAD

我是来解决冲突的哦

=======

???????? 这次是我来解决冲突的

>>>>>>> f1

修改为:

???????? 这次是我来解决冲突的

 然后再合并提交

nelsen-mac:learngit mac$ git add readme.md 
nelsen-mac:learngit mac$ git commit -m'now is ok'
[master 4bdd120] now is ok

用 git log --graph --pretty=oneline --abbrev-commit 查看分支合并情况

然后再删除分支 git branch -d f1