Re: Merge made by recursive?

From: Jakub Narebski <jnareb@gmail.com>
Date: May 25, 2011, 18:04 UTC
Message-ID: <m339k2zmh8.fsf@localhost.localdomain>
In-Reply-To: <loom.20110525T192418-887@post.gmane.org>

Shawn Ligocki <sligocki@gmail.com> writes:

> Is this intentionally bad grammar? Every time I see it, I cringe a little. What 
> does it even mean? That it merged incrementally through each subsequent revision?

"Merge made by recursive" means "Merge made by 'recursive' merge strategy", where 'recursive' part refers to the fact that in case of criss-cross merge

        /--*---B1---M1---*---#  <-- foo
       /        \  /
   ---B           x
       \         / \
        \--*---B2---M2---*---#  <-- bar

(you are trying to merge 'bar' into 'foo') when we have more than one merge base, the strategy first creates synthetic merge for B1 and B2

                    M1---*---#  <-- foo
                   /
                  X
                   \
                    M2---*---#  <-- bar

and uses this X as a merge base for further merging. Or something like that.

See "Merge strategies" section in git-merge(1) documentation.

-- 
Jakub Narebski
Poland
ShadeHawk on #git