22
Git的合并冲突是这个样子一般:git:如何让合并冲突的“我们的,他们的,原创的”?
<<<<<<< HEAD:file.txt
Code changed by A
=======
Code changed by B
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt
不过,我知道这是可能的(有一些混帐配置选项)也显示原代码,而不仅仅是改变。像这样:
<<<<<<< HEAD:file.txt
Code changed by A
=======
Original code
=======
Code changed by B
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt
但是,我找不到选项了...任何人都可以帮助我吗?