Discuss / Git / 提问
Back

提问

Topic source

你曾温润如玉

#1 Created at ... [Delete] [Delete and Lock User]

手动修改冲突的文件时,为什么里面那个标记<<<<<<< HEAD  >>>>>>>  =================== 也有啊?是不是得删掉?

我让您受精了

#2 Created at ... [Delete] [Delete and Lock User]

改成你要的版本，删掉多余的  <<<<<<< HEAD  >>>>>>>  ===================

  • 1

Reply