Need to abort the rebase before starting a merge
Better handling of errors
Avoiding rebases when they're unnecessary