Recursive Git Branch Generation

Recursive uses diff3 recursively to generate a virtual branch which will be used as the ancestor. E.g.: (A)----(B)----(C)----(F) Then: git checkout E git merge F

A diagram shows a recursive diff3 process generating a virtual Git branch to use as an ancestor, followed by the commands “git checkout E” and “git merge F.” The joke is aimed at programmers familiar with Git’s complicated merge logic and recursive ancestry, making an abstract technical process look like a strange branching family tree. EN: A diagram shows a recursive diff3 process generating a virtual Git branch to use as an ancestor, followed by the commands “git checkout E” and “git merge F.” The joke is aimed at programmers familiar with Git’s complicated merge logic and recursive ancestry, making an abstract technical process look like a strange branching family tree.

• @ithueti / 2005 2020-02-14