From: Nicolas Pitre <nico@cam.org>
Date: Thu, 01 Nov 2007 02:27:46 GMT
Subject: Re: Newbie: report of first experience with git-rebase.
Message-ID: <alpine.LFD.0.9999.0710312224380.21255@xanadu.home>
In-Reply-To: <7vhck7gdzs.fsf@gitster.siamese.dyndns.org>

On Wed, 31 Oct 2007, Junio C Hamano wrote:

> A rebase conflict resolution that results in emptiness is a
> rather rare event (especially because rebase drops upfront the
> identical changes from the set of commits to be replayed), but
> it does happen.  One could argue that "rebase --continue" can
> notice that the resolved index is identical to the tree of the
> HEAD commit and skip it automatically.
> 
> Given an index that is identical to HEAD, however, it is not
> easy to safely determine if that is because the patch did not
> apply at all, or the patch was applied with conflicts _and_ the
> user decided to make the patch a no-op by resolving.  The
> automatic droppage of the commit needs to happen only on the
> latter and never on the former.

Probably some additional clue could be displayed for the user benefit.  
This might solve the issue nicely.


Nicolas