Recovering From Bad Rebase