This results in a merge situation which is not altogether different from merging branches.

• 在一个合并的地方这个结果不是同合并分支差异相同的。