Git_解决冲突

解决冲突

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

• 1. 在两个分支分别做修改然后提交

$ git checkout -b feature1
// 修改readme.txt最后一行，改为：Creating a new branch is quick AND simple.
$ git add readme.txt
$ git commit -m "AND simple"

$ git checkout master
// 修改readme.txt最后一行，改为：Creating a new branch is quick & simple.
$ git add readme.txt 
$ git commit -m "& simple"

• 2. 现在，master分支和feature1分支各自都分别有新的提交，变成了如下图所示，这个时候去 git merge 一定会冲突
  
• 3. git merge 以后去查看 readme.txt的内容, 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.
$ cat readme.txt
...
<<<<<<< HEAD
Creating a new branch is quick & simple.
=======
Creating a new branch is quick AND simple.
>>>>>>> feature1 

• 4. 把Git合并失败的文件手动编辑为我们希望的内容，再提交，

# // 修改readme.txt最后一行，改为：Creating a new branch is quick and simple.
$ git add readme.txt 
$ git commit -m "conflict fixed"
[master cf810e4] conflict fixed

在master提交修改以后，master分支和feature1分支变成了下图所示：

抄的这个：GIT教程