Patch Set 4: I would prefer that you didn't submit this

We found a problem when mixing continue and skip steps in a sequence when multiple commits conflict during the overall rebase.

Mathias is analyzing that.