When you have a conflict in rebase, you get to resolve conflicts. After resolving conflicts - like with merge - you are left hanging.

It took me a drive home, shower and scratching my head a while to realize how you --continue after such thing. Apparently you need to do "Rebase..." again to get the dialog I would expect after resolving conflicts.

Like in bug 250823, this should be prompted after resolving conflicts to help the workflow. Very much so. The mess I saw today after a human subject *continued* working in this state was outstanding and doing --abort ended up with head->desk and a lot of manual fixing up.

Netbeans doesn't really even prevent you from doing something stupid as you are left in a detached head state and you can just checkout another branch to really throw it off. The status of the repo is "Rebasing..." but your working tree is messed up and you are not in the rebase head anymore but actually in some real branch.

It isn't at fault when it comes to screwing up like this, but the damage can be prevented by not letting the user to break everything (switching branches, committing, etc.) while rebasing.