How to continue rebase after resolve conflicts

Ralph Callaway September 30, 2014

If a rebase generates conflicts that have to be manually resolved, how do I continue the rebase after resolving the conflicts? 

I can do this from the terminal with `git rebase --continue`, but while stuff I read only line says I just need to do a commit I get a warning that the commit message is empty.

Is that not possible with source tree?

Platform:  OS X 10.9.5

SourceTree: 2.0.0

2 answers

1 accepted

12 votes
Answer accepted
Cherny D. C. Berbesí I. February 4, 2016

Yes, it's possible. Just go to Actions > Continue Rebase. That will continue the rebasing process smile


Patrick Little February 17, 2021

Yes the option is there, but it throws an error message


git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks -c lfs.customtransfer.bitbucket-media-api.path=git-lfs-bitbucket-media-api -c sequence.editor='C:\Users\patrick.little\AppData\Local\SourceTree\app-3.3.9\tools\stree_gri' -c core.editor='C:\Users\patrick.little\AppData\Local\SourceTree\app-3.3.9\tools\stree_gri' rebase --continue
error: There was a problem with the editor ''C:\Users\patrick.little\AppData\Local\SourceTree\app-3.3.9\tools\stree_gri''.
Please supply the message using either -m or -F option.
error: could not commit staged changes.
Completed with errors, see above.


Using 'git rebase --continue' from the terminal works fine.

1 vote
Wouter Vos August 28, 2018

That option is greyed out for me, does that mean my rebase is complete?

I thought that was the case, but vscode put * + (Rebasing) behind the branch name that the repository is on.

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events