Its concept of a conflict is purely textual, arising when two changes to the same base file are near enough to spook the merge command.

• 其冲突概念纯粹是文本意义上的,当对于同一基本文件的两个更改时间上非常非常接近,从而使合并命令受到干扰时,就会发生冲突。