廖雪峰Git课程笔记（十五）解决冲突

人生不如意之事十之八九，合并分支往往也不是一帆风顺的。

准备新的feature1分支，继续我们的新分支开发：

$ git checkout -b feature1
Switched to a new branch 'feature1'

修改最后一行，为：

Creating a new branch is quick AND simple.

在feature1分支上提交

$ git add readme.txt 
$ git commit -m "AND simple"
[feature1 2512cfd] 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 400b400] & simple
 1 file changed, 1 insertion(+), 1 deletion(-)

现在，master分支和feature1分支各自都分别有新的提交，变成了这样：

这种情况下，Git无法执行“快速合并”，只能试图把各自的修改合并起来，但这种合并就可能会有冲突，我们试试看：

$ git merge feature1
Auto-merging readme
CONFLICT (content): Merge conflict in readme
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

no changes added to commit (use "git add" and/or "git commit -a")

我们可以直接查看readme的内容

Git is a distributed version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
<<<<<<< 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 59bc1cb] conflict fixed

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

$ git log --graph --pretty=oneline --abbrev-commit
*   e1bab73 (HEAD -> master) conflict fixed
|\  
| * 2512cfd (feature1) AND simple
* | e33428b & simple
|/  
* 1f647c4 branch test
* efdb1eb (origin/master) remove test
* cabbafb add test
* 396deb9 git tracks changes1
* b6eb0ee git tracks changes
* 15980f6 understand how stage works
* 1a063f4 understand how stage works 1
* afb5318 append GPL
* 2e7d71a add distributed
* cb101fe wrote a readme file

最后，删除feature1分支：

$ git branch -d feature1
Deleted branch feature1 (was 75a857c).

工作完成。。。。

好吧，我好像忘合并了，官网也没有最后的合并步骤（还是说，已经合并了，我自己没弄对。。。反正我没弄清楚，就决定再试一下）然后，我打开vi编辑器，查看里面的内容，发现是and。。。。

我在后面又重新建了一个分支feature1,将里面的改为AND重新合并，然后，好像可以了。。。

$ git merge feature1 
Updating e1bab73..eb469b8
Fast-forward
 readme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

但是，我提交的时候………………：

$git commit -m "conflict fixed1"
On branch master
Your branch is ahead of 'origin/master' by 5 commits.
  (use "git push" to publish your local commits)

Untracked files:
    gitskills/

nothing added to commit but untracked files present

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

Untracked files:
  (use "git add <file>..." to include in what will be committed)

    gitskills/

nothing added to commit but untracked files present (use "git add" to track)

上网查了下，好像说，这个文件夹也要add进去。。。。于是：

$git add ./gitskills/
$git add readme 
$git commit -m "conflict fixed1"
[master dc8400f] conflict fixed1
 1 file changed, 2 insertions(+)
 create mode 100644 gitskills/README.md
$ git status
On branch master
Your branch is ahead of 'origin/master' by 6 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean

总算清净了。。。。

git log --graph --pretty=oneline --abbrev-commit
* dc8400f (HEAD -> master) conflict fixed1
* eb469b8 (feature1) AND simple2
*   e1bab73 conflict fixed
|\  
| * 2512cfd AND simple
* | e33428b & simple
|/  
* 1f647c4 branch test
* efdb1eb (origin/master) remove test
* cabbafb add test
* 396deb9 git tracks changes1
* b6eb0ee git tracks changes
* 15980f6 understand how stage works
* 1a063f4 understand how stage works 1
* afb5318 append GPL
* 2e7d71a add distributed
* cb101fe wrote a readme file

最后，再次删除一下

$ git branch -d feature1 
Deleted branch feature1 (was eb469b8).

工作完成。。。。