0
点赞
收藏
分享

微信扫一扫

跟廖雪峰学习git(6.0)


解决冲突

合并分支往往也不是一帆风顺的。

准备新的​​feature1​​分支,继续我们的新分支开发:

git checkout -b feature1

输出如下:

Switched to a new branch 'feature1'
D readme.txt

修改readme.txt最后一行,改为:

Creating a new branch is quick AND simple.

在​​feature1​​分支上提交:

git add readme.txt
git commit -m "AND simple"

输出如下:

[feature1 ab01e68] 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.
(use "git push" to publish your local commits)

Git还会自动提示我们当前​​master​​​分支比远程的​​master​​分支要超前1个提交。

在​​master​​​分支上把​​readme.txt​​文件的最后一行改为:

Creating a new branch is quick & simple.

提交:

git add readme.txt
git commit -m "& simple"

输出如下:

[master 5f74c5d] & simple
1 file changed, 1 insertion(+), 1 deletion(-)

​master​​​分支和​​feature1​​分支各自都分别有新的提交,变成了这样:

跟廖雪峰学习git(6.0)_Git

这种情况下,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​​​文件存在冲突,必须手动解决冲突后再提交。​​git status​​也可以告诉我们冲突的文件:

输入:

git status

输出如下:

On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)

You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)

Unmerged paths:
(use "git add <file>..." to mark resolution)

both modified: readme.txt

查看readme.txt的内容,输入如下:

cat readme.txt

输出如下:

<<<<<<< HEAD
Creating a new branch is quick & simple.
=======
Creating a new branch is quick AND simple.
>>>>>>> feature1

Git用​​<<<<<<<​​​,​​=======​​​,​​>>>>>>>​​标记出不同分支的内容,修改如下后保存:

Creating a new branch is quick and simple.

提交:

git add readme.txt
git commit -m "conflict fixed"

输出如下:

[master 1d26147] conflict fixed

现在,​​master​​​分支和​​feature1​​分支变成了下图所示:

跟廖雪峰学习git(6.0)_Git_02

用带参数的git log也可以看到分支的合并情况:

git log --graph --pretty=oneline --abbrev-commit

输出如下:

*   1d26147 (HEAD -> master) conflict fixed
|\
| * ab01e68 (feature1) AND simple
* | 5f74c5d & simple
|/
* d03e35c branch test
* ee37c08 (origin/master) wrote a readme.txt

最后,删除​​feature1​​分支:

git branch -d feature1

输出如下:

Deleted branch feature1 (was ab01e68).

工作完成。

小结

当Git无法自动合并分支时,就必须首先解决冲突。解决冲突后,再提交,合并完成。

解决冲突就是把Git合并失败的文件手动编辑为我们希望的内容,再提交。

用​​git log --graph​​命令可以看到分支合并图。

举报

相关推荐

0 条评论