git合并的时候合并成功但是之后文件中出现了冲突标记

Question

我在和同学一起开发的时候由于共同修改了一个文件，两人pull之后合并均未出现问题，但是文件中其实已经出现了
> 49e2410
这样的冲突标记。这是怎么回事呢？
我刚在他那里修改好了提交到服务器上，我来我这边pull又出现了同样的问题。

Answer 1

• Use git pull with caution, it is safer to fetch first and then merge.

Answer 2

Git helps you merge quickly. If the quick merge is not successful. If you don't deal with the merge head in the code, you won't be able to push.