sequencer: do not squash 'reword' commits when we hit conflicts