Git如何插入其他共同祖先进行合并

Question

I am trying to merge two different branches in Git like this:

                         [Mod 1 binary] - [Mod 1 Text]
                    /                                 \
[Original(Binary)]                                      [CombinedText]   
                    \                                 /
                         [Mod 2 Binary] - [Mod 2 Text]

The problem is that the merge tool I am using can only handle text files so the binary file does not work as a common ancestor. I want to make a text file from the original binary file with a conversion tool ant then have a structure like this so I can merge:

                                     [Mod 1 Text]
                                   /               \
[OriginalBinary] - [Original Text]                    [Combined Text]
                                   \                /
                                     [Mod 2 Text]

How can I accomplish this?

Answer 1

Sounds like you should do exactly what you said: "commit on a new branch". In a shell-based session your task might go like this:

$ git checkout -b work-br <commit-id>

(here <commit-id> is the ID of the commit containing OriginalBinary ), then:

$ tool_cmd [options] binary [> text]  # or however this works
$ git add text
$ git commit

You now have:

    B - C        <-- branch-1
  /
A
 \\
 |  D - E        <-- branch-2
 |
 |
  \
    F            <-- work-br

where commit A has only the original binary, B has Mod1 Binary , C has Mod1 Text , D has Mod2 Binary , and E has Mod2 Text . New commit F has both the original binary and the text-ified version.

At this point you can make two (or just one, really) more branch and then git cherry-pick commit C into one of the two new branches, switch to the other branch, git chery-pick commit E into the other, and have this graph fragment:

    B - C        <-- branch-1
  /
A
 \\
 |  D - E        <-- branch-2
 |
 |      C'       <-- work-branch-1
  \   /
    F
      \
        E'       <-- work-branch-2

Now you can merge the text files (ignoring or even removing the binary files if need be) to get a merged result, which you can then import back to whichever original branch you want, or even just use directly from this new set of branches.

Answer 2

After

$git replace --graft hash([Mod 1 Text]) hash([Original text])
$git replace --graft hash([Mod 2 Text]) hash([Original text])

git will merge both [Mod 1 Text] [Mod 2 Text] as if [Original text] is their common parent. You can later remove the replacement with git replace -d hash([Mod 1 Text]) hash([Mod 2 Text]) if you feel like.

See https://git-scm.com/docs/git-replace for details.