From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 09 Sep 2008 17:34:42 GMT
Subject: Re: git merge vs git commit
Message-ID: <7vhc8p6x59.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080909165236.GA8850@flint.arm.linux.org.uk>

Russell King <rmk@arm.linux.org.uk> writes:

> If there aren't any conflicts, you get a nice clean merge, resulting in:
> ...
> However, if you have a conflict that needs resolving, you fix it up as
> ...
> instead - an additional reference from commit 'K' back to commit 'A'
> which isn't present in the clean merge case.
>
> Is this intentional, or is it a bug?

I think some changes went into 1.6.0 around this area to (r)eject parents
that are redundant.  What happens when you use more recent git with the
same example?