创建一个新分支 git checkout -b dev1,修改第一行 "这是一个测试解决冲突的分支" 在此分支上提交git add . git commit -m "test",
切换到master分支,修改第一行 "这是master分支上的修改" 在master分支上提交
现在,master
分支和feature1
分支各自都分别有新的提交,变成了这样:
解决冲突
Reads: 598660
人生不如意之事十之八九,合并分支往往也不是一帆风顺的。
准备新的feature1
分支,继续我们的新分支开发:
$ git checkout -b feature1
Switched to a new branch 'feature1'
修改readme.txt最后一行,改为:
Creating a new branch is quick AND simple.
在feature1
分支上提交:
$ git add readme.txt
$ git commit -m "AND simple"
[feature1 75a857c] AND simple
1 file changed, 1 insertion(+), 1 deletion(-)
切换到master
分支:
$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 1 commit.
Git还会自动提示我们当前master
分支比远程的master
分支要超前1个提交。
在master
分支上把readme.txt文件的最后一行改为:
Creating a new branch is quick & simple.
提交:
$ git add readme.txt
$ git commit -m "& simple"
[master 400b400] & simple
1 file changed, 1 insertion(+), 1 deletion(-)
现在,master
分支和feature1
分支各自都分别有新的提交,变成了这样:
这种情况下,Git无法执行“快速合并”,只能试图把各自的修改合并起来,但这种合并就可能会有冲突,我们试试看:
$ git merge feature1
Auto-merging readme.txt
CONFLICT (content): Merge conflict in readme.txt
Automatic merge failed; fix conflicts and then commit the result.
果然冲突了!Git告诉我们,readme.txt文件存在冲突,必须手动解决冲突后再提交, 修改内容提交
![](data:image/png;base64,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)
用带参数的git log
也可以看到分支的合并情况:
git log --graph --pretty=oneline --abbrev-commit
删除分支,工作完成.
用 git log --graph可以查看分支合并图