You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
Well, the title already says it.
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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).
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
"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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
When you are in the "Rebase" state, your repository will have orange [Rebase] badge in the repositories list.
To exit this state you:
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
"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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.