Git 使用的合并冲突语法是否有名称？
Is there a name for the merge conflict syntax Git uses?
当遇到冲突时，冲突在文件中标记为：
<<<<<<< HEAD
<p>Once she climbed a tree and then forgot how to climb back down again</p>
=======
<p>Once, forgot where her food bowl was and was hungry all day</p>
>>>>>>> prequel
这个语法有名称吗？这在 VCS 中似乎很常见。
Git 称之为 "conflict markers"
Git automatically adds conflict markers to the affected areas. A conflict-marked area begins with <<<<<<< and ends with >>>>>>>. These are also known as the conflict markers. The two conflicting blocks themselves are divided by a =======.
Mercurial 使用 similar wording
At this point, what happens depends on how Mercurial is configured (see MergeToolConfiguration). Per default, Mercurial inserts a set of markers into the files to be merged in your working copy:
非分布式系统？颠覆使用 "confict markers"
The strings of less-than signs, equal signs, and greater-than signs are conflict markers, and are not part of the actual data in conflict.
他们的祖父，CVS，也称他们为conflict sections
Inside a file with conflicts, there are one or more conflict sections. Each one begins with "<<<<<<<", followed by the section as found in your local file (or the first argument to cvs checkout if you're doing a merge), followed by "=======", followed by the other conflicting version, followed by ">>>>>>>".
似乎 "conflict markers" 是引用这些的常用方式。这些文档有的是官方的，有的是第三方制作的，但它们都使用相似的措辞。
作为已接受答案的补充：这些标记也被 diff3 工具使用，因此这种特殊语法有时被称为 "diff3 conflict markers"。
当遇到冲突时，冲突在文件中标记为：
<<<<<<< HEAD
<p>Once she climbed a tree and then forgot how to climb back down again</p>
=======
<p>Once, forgot where her food bowl was and was hungry all day</p>
>>>>>>> prequel
这个语法有名称吗？这在 VCS 中似乎很常见。
Git 称之为 "conflict markers"
Git automatically adds conflict markers to the affected areas. A conflict-marked area begins with <<<<<<< and ends with >>>>>>>. These are also known as the conflict markers. The two conflicting blocks themselves are divided by a =======.
Mercurial 使用 similar wording
At this point, what happens depends on how Mercurial is configured (see MergeToolConfiguration). Per default, Mercurial inserts a set of markers into the files to be merged in your working copy:
非分布式系统？颠覆使用 "confict markers"
The strings of less-than signs, equal signs, and greater-than signs are conflict markers, and are not part of the actual data in conflict.
他们的祖父，CVS，也称他们为conflict sections
Inside a file with conflicts, there are one or more conflict sections. Each one begins with "<<<<<<<", followed by the section as found in your local file (or the first argument to cvs checkout if you're doing a merge), followed by "=======", followed by the other conflicting version, followed by ">>>>>>>".
似乎 "conflict markers" 是引用这些的常用方式。这些文档有的是官方的，有的是第三方制作的，但它们都使用相似的措辞。
作为已接受答案的补充：这些标记也被 diff3 工具使用，因此这种特殊语法有时被称为 "diff3 conflict markers"。