我在 Head 提交和上一次提交之间分析了git diff
。
我在终端中有git diff
个输出。要纠正不必要的差异,我需要在 Sublime Text 和 Terminal 之间切换。
是否可以直接在文件中获取git diff
的输出,这有区别吗?
以某种方式,当您有git输出时,当您在分支之间有git merge
冲突时。当git在代码中直接插入带有差异的行时,并记下这样的提交名称
<<<<<<<
Changes made on the branch that is being merged into. In most cases,
this is the branch that I have currently checked out (i.e. HEAD).
|||||||
The common ancestor version.
=======
Changes made on the branch that is being merged in. This is often a
feature/topic branch.
>>>>>>>