Re: Staging/Master Merge - James' Patchy

[David Kastrup]

"Phil Holmes" <address@hidden> writes:

>> No way to sort the patches in a manner where they work out at every
>> step?
>
> It may well have been, but it would have taken far more effort than
> compressing them into a single commit.  At that point, my brain was
> already hurting.

_Please_ check out git rebase -i.  For rearranging the last five
commits, you call

git rebase -i HEAD~5

and the rest explains itself.  And in case you mess up royally for
whatever reason,

git reset --hard "address@hidden minutes ago}"

will put you back to where you started 5 minutes ago.

-- 
David Kastrup