Git recursive strategy with multiple ancestors and kdiff3

I am running a merge with a script in which several "common ancestors" are available, so Git works with "git merge recursive".

Thus, it starts the merge to create a new ancestor, which, in turn, will be used as a CA for the authors I'm working on.

So, the problem is this: there is a file with a conflict that the “ancestor” comes from the “recursive merge” executed inside Git, so when I try to fix the conflict with Git mergetool using KDiff3, I see the following: enter image description here

This is normal? My example is a bit "too simple" (only one line in the file, not the real one), but ... will it have this common ancestor?

Thank!!

+3
1

. - . ( , , ).

-2

All Articles