From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date: Mon, 30 May 2005 09:21:40 GMT
Subject: Re: More gitweb queries..
Message-ID: <20050530092140.GQ12290@cip.informatik.uni-erlangen.de>
In-Reply-To: <20050530083653.GL12290@cip.informatik.uni-erlangen.de>

Hello,
I also have to strip duplicate HEADs out. So we do the following:

run 0: kill dups

run 1: kill HEADs which are referenced in the history of other HEADs

run 2: do the merging (still don't know to what I should set the local
       HEAD to the 'left' or 'right' part. Maybe we should create temporary
       commit object so that 'merge-base' can better work on them?

	Thomas