From: Chris Webb <chris@arachsys.com>
Date: Tue, 31 Jul 2012 12:48:25 GMT
Subject: Re: [PATCH] rebase -i: handle fixup of root commit correctly
Message-ID: <20120731124824.GC14028@arachsys.com>
In-Reply-To: <20120731111938.GD19416@arachsys.com>

Chris Webb <chris@arachsys.com> writes:

> If we have a conflict in the middle of a chain of fixup/squashes, as far as
> I can see, we have a HEAD with all the previous successful fixups applied,
> conflict markers for the current failed pick, and when the conflict has been
> resolved, git rebase --continue will commit --amend the resolution and
> continue? Isn't that the correct behaviour here?

As an explicit test, I've just tried a chain of four squashed commits, each
of which deliberately resulted in a conflict to manually resolve. For each
squash, I was left with conflict markers on top of what had already been
squashed in the expected way, and when I continued after resolving these,
the resolution was 'commit --amend'ed in the expected way, with the same
behaviour and resulting commit at the end of the rebase -i as I get with a
copy of git without this patch.

Cheers,

Chris.