Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: Newbie: report of first experience with git-rebase.

From: Nicolas Pitre <hidden>
Date: 2016-06-15 22:43:45

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help