Thread (1 message) 1 message, 1 author, 2016-06-15

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

From: David Kastrup <hidden>
Date: 2016-06-15 22:43:45

Junio C Hamano [off-list ref] writes:
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,
Wouldn't there be a conflict in the index?  A conflict which can only be
resolved by adding?  Which then results in a question whether you forgot
to add?

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help