From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date: Fri, 27 May 2005 19:29:41 GMT
Subject: Re: More gitweb queries..
Message-ID: <20050527192941.GE7068@cip.informatik.uni-erlangen.de>
In-Reply-To: <Pine.LNX.4.58.0505271145570.17402@ppc970.osdl.org>

Hello,

> I get the urge to do octopus-merges in the kernel just because of how
> good they look in gitk ;) ]

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

	Thomas