From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date: Fri, 27 May 2005 19:55:52 GMT
Subject: Re: More gitweb queries..
Message-ID: <20050527195552.GA6541@cip.informatik.uni-erlangen.de>
In-Reply-To: <7vhdgoxx8c.fsf@assigned-by-dhcp.cox.net>

Hello,

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

I see. Does that mean that 'git-ls-files --unmerged' will report upto 9
stages per file?

> 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.

I got that part. :-)

	Thomas