Re: [PATCH v2] sequencer: do not squash 'reword' commits when we hit conflicts

[Junio C Hamano <gitster@pobox.com>]

Phillip Wood <phillip.wood@talktalk.net> writes:

>> Oh, you're right, the fast-forwarding path would pose a problem. I think
>> there is an easy way to resolve this, though: in the case that we do want
>> to amend the to-be-reworded commit, we simply have to see whether HEAD
>> points to the very same commit mentioned in the `reword` command:
>
> That's clever, I think to get it to work for rewording the root commit,
> it will need to do something like comparing HEAD to squash-onto as well.

So, for the second attempt by Elijah, Dscho said it is good while
you noticed a problem with ff, to which Dscho agreed is a better
approach, and you extended it which brings us here.

I'll leave the thread hanging here while I pick other leftover bits
for 2.18 final and then will come back.  Hopefully by that time I'll
find the final version of the patch to conclude this topic that I
can apply on top of 2.18.0 ;-)

Thanks.