Git无法合并

Question

我创建了一个名为tmp的分支，进行了一些提交，现在当我尝试合并时失败。当我输入git branch -avvv我看到下面的

master    f439a52 [origin/master] updated footer formatting 
* tmp     acc5818 added analytics and logos 
remotes/origin/master f439a52 updated footer formatting 

然后我检查了主，试图合并tmp，但是我有一大堆的错误，如CONFLICT (content): Merge conflict in ....

的我试图再次检查TMP出来，但随后它说Automatic merge failed; fix conflicts and then commit the result.我不知道冲突是什么，所以我不知道如何解决它们。我想保留所有在tmp分支中创建的新增内容。我输入git reset --hard并切换回tmp。然后我删除了主人，创建了一个新的主分支，并尝试合并tmp，但同样的事情又发生了。

Answer 1

当你做一个 git merge它会实际修改有冲突的文件，并告诉你有什么区别。您必须手动编辑有冲突的文件，然后提交这些更改。

例

<<<<<<< 
Changes made on the branch that is being merged into. In most cases, 
this is the branch that I have currently checked out (i.e. HEAD). 
||||||| 
The common ancestor version. 
======= 
Changes made on the branch that is being merged in. This is often a 
feature/topic branch. 
>>>>>>>