Make sure we revert if rebase goes south

make sure that:
- we revert if rebase goes south
- we check for conflicted and conflicted_unresolved statuses