How to get out of the rebasing state

Well, the title already says it.

2 answers

1 accepted

This widget could not be displayed.

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

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

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).

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?

"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.

This widget could not be displayed.

"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.

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Posted yesterday in Canada

AUG Lunch Roundtable - August 13 - Highlights

Thanks to everyone who came out today for the lunch AUG - we had some great food and discussion (and ice cream sandwiches to fend off the heat!) The welcome and fun fact was great as well, what an aw...

39 views 2 3
View post

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you