Re: [BUG] git rebase is confuse if conflict resolution doesn't produce diff

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 15, 2008, 18:41 UTC
Message-ID: <7vzlne9l49.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1218819643.6345.57.camel@cass-lpt>

Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> writes:

Show 9 quoted lines

> To reproduce:
> - Rebase a branch "foo" on a branch "bar" in a way that there is a
> conflict that you have to manually resolve.
> - Run git diff and see the conflict
> - Edit the conflicted file and remove all the conflicting bits (that
> could be a valid resolution of the conflict)
> - Now git diff produces an empty diff
> - git add $CONFLICTED_FILE  as you have resolve the conflict
> - git rebase --continue

I think you would need a bit more than that to trigger this "behaviour". Your resolution needs to be such that it is identical to the HEAD where the rebased change is applied to, iow, among the series of commits, the final effect chosen by you from this particular one is not to do anything. So, not just "Now git diff produces an empty diff" in the above sequence, which merely means that the three-way --cc diff between the conflicted parties are resolved by taking from one side, after that "git add", "git diff HEAD" will have to be empty, for you to see the message.

In essence, the final effect chosen by you is to skip this commit. You might want to say "git rebase --skip" here if that is the case.