improve rebase help for conflict situation

[Julius Davies [bit-booster.com]]

When the rebase fails because of a conflict, we currently recommend a manual rebase in detached head state.

This causes git itself to issue a lot of spurious suggestions to the developer. We should probably clarify in our help text that the user can ignore git, and stay in detached head for the entire operation.