简体繁体 English

git 具有多个祖先和kdiff3的递归策略

[英]git recursive strategy with multiple ancestors and kdiff3

原文 2011-05-05 07:04:25 1 1 git/ git-merge/ kdiff3

I'm running a merge with a scenario where several "common ancestors" are available so Git runs "git merge recursive" strategy.我正在与几个“共同祖先”可用的场景进行合并，因此 Git 运行“git merge recursive”策略。

As such, it runs a merge to create a new ancestor that will, in turn, be used as CA for the contributors I'm working on.因此，它运行合并以创建一个新的祖先，该祖先又将用作我正在处理的贡献者的 CA。

Ok, the problem is the following, there's a file with a conflict which "ancestor" comes from the "recursive merge" performed internally by Git, so, when I try to fix the conflict with git mergetool using KDiff3, I see the following:好的，问题如下，有一个文件存在冲突，其中“祖先”来自 Git 内部执行的“递归合并”，因此，当我尝试使用 KDiff3 修复与 git 合并工具的冲突时，我看到以下内容：在此处输入图像描述

Is this normal?这是正常的吗？ My example is a little bit "too simple" (only one line in the file, so not real), but... will having this common ancestor help?我的例子有点“太简单了”（文件中只有一行，所以不是真的），但是......有这个共同的祖先会有帮助吗？

Thanks!!谢谢！！

1 个解决方案

You should have no problem in fixing the merge conflicts.修复合并冲突应该没有问题。 This merge strategy was defined as the default one for a reason.出于某种原因，此合并策略被定义为默认策略。 Try it (you might want to add a tag to be able to go back if it goes wrong).试试看（如果出错，您可能需要添加一个标签以便能够返回 go）。