Re: More gitweb queries..

quoted

quoted

quoted

quoted

"TG" == Thomas Glanzmann [off-list ref] writes:

TG> talking about octopus-merges ... I don't understand how they work. What
TG> happens if one file is touched in every of the 8 trees. How can that be
TG> handled?

You merge by hand and resolve if they have conflicts, just like
what you already do in two head merge case.

Octopus is only about how you record the results.  Instead of
making 7 consecutive "merge from A" "merge from B" to record two
head merges, you just say "I merged these 8 heads" in a single
commit.