One approach to fixing a bad rebase.