Shawn Ligocki <sligocki@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html