如何使用“zealous diff3”用吉特？有什么优点和缺点？

Question

我刚刚阅读了 Git 2.35.0 的发行说明 （注意 2.35.1 已经可用）。

在这些发行说明中，我看到：

• 添加了“Zealous diff3”风格的合并冲突呈现。

我的问题：

1. 如何使 git diff / difftool 默认为“热心”差异演示文稿？
2. 与默认的差异呈现模式相比，使用它有哪些优点和缺点？

Answer 1

新的“zealous diff3”样式是：

merge.conflictStyle = zdiff3

您可以设置它

git config --global merge.conflictStyle zdiff3

例如，

（假设您希望在每用户配置中使用它）。默认样式是 merge：（

Here are lines that are either unchanged from the common
ancestor, or cleanly resolved because only one side changed,
or cleanly resolved because both sides changed the same way.
<<<<<<< yours:sample.txt
Conflict resolution is hard;
let's go shopping.
=======
Git makes conflict resolution easy.
>>>>>>> theirs:sample.txt
And here is another line that is cleanly resolved or unmodified.

此示例直接来自 git merge 文档）。 diff3 样式在中间添加了合并基础版本，并带有竖线：

Here are lines that are either unchanged from the common
ancestor, or cleanly resolved because only one side changed,
<<<<<<< yours:sample.txt
or cleanly resolved because both sides changed the same way.
Conflict resolution is hard;
let's go shopping.
||||||| base:sample.txt
or cleanly resolved because both sides changed identically.
Conflict resolution is hard.
=======
or cleanly resolved because both sides changed the same way.
Git makes conflict resolution easy.
>>>>>>> theirs:sample.txt
And here is another line that is cleanly resolved or unmodified.

请注意，为了显示 base 版本和两个分支提示之间的差异版本，该行：

or cleanly resolved because both sides changed the same way.

曾经位于<<<<<<<<<<<<<之外 ... >>>>>>> 部分（因为它已完全解决）现在在此部分中。

zdiff3 所做的是采用与 merge 相同的“或完全解析”路径：

Here are lines that are either unchanged from the common
ancestor, or cleanly resolved because only one side changed,
or cleanly resolved because both sides changed the same way.
<<<<<<< yours:sample.txt
Conflict resolution is hard;
let's go shopping.
||||||| base:sample.txt
or cleanly resolved because both sides changed identically.
Conflict resolution is hard.
=======
Git makes conflict resolution easy.
>>>>>>> theirs:sample.txt
And here is another line that is cleanly resolved or unmodified.

这在某种程度上是一个谎言，但它有用说谎。

请注意，如果您愿意，您可以获取任何现有的冲突文件，并以新的合并样式重新创建冲突：（

git checkout --conflict=zdiff3 conflicted.txt

或与 git Restore 相同，但我还没有重新训练我的手指