support stateful rebase (with conflicts)

[extrawurst]

based on #816:

but this time even with conflicts!

• rebase interrupts on conflicts
• this state is reflected visually
• rebase can be aborted fixing the state of the repo
• after fixing a conflict the rebase can be continued