How to get out of the rebasing state

[Mike Lehmann]

Well, the title already says it.

[Steve Streeting · Accepted solution]

Either 'Commit' or 'Pull' will detect the rebase state and direct you to the rebasing options you have to proceed.

[Mike Lehmann]

I don't want to Commit, but instead abort the rebase. Pull/fetch does not work for me at all - see my first answer.

[Steve Streeting]

This is the dialog which is displayed when your repo is in the rebase state, when you click either Pull, Commit, or right-click anything and select 'Rebase' again: http://www.screencast.com/t/B24xnvwPiDAd. Just click 'Abort Rebase'. You don't actually have to commit or do any other actions, this comes up first.

If this dialog doesn't appear, your repo is not in a rebase state (no .git/rebase-apply).

[Mike Lehmann]

Ah, OK. If I recall correctly, there are three options when a rebase stopped - continue (conflict has been solved), skip and abort. It looks like SourceTree does not handle the second option?

[Steve Streeting]

"rebase --skip" is just a special case of "rebase --continue" - it's just that you discard your current changes. Many people find skip/continue ambiguous for this reason.

SourceTree will automatically issue "rebase --skip" if you opt to "Continue Rebase" and there are no changes in the working copy. Therefore to skip, you just discard your changes and continue. Personally I think this is more intuitive and clear about your intentions - it also means that if you progressively discard changes and end up with none left, you don't have to pick a different action - 'Continue' just does the right thing.

[Steve Streeting]

"rebase --skip" is just a special case of "rebase --continue" - it's just that you discard your current changes. Many people find skip/continue anbiguous for this reason.

SourceTree will automatically issue "rebase --skip" if you opt to "Continue Rebase" and there are no changes in the working copy. Therefore to skip, you just discard your changes and continue. Personally I think this is more intuitive and clear about your intentions - it also means that if you progressively discard changes and end up with none left, you don't have to pick a different action - 'Continue' just does the right thing.