How to continue rebase after resolve conflicts

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

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

Screen_Shot_2016-02-04_at_6_59_07_PM.png

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

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.

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Suggest an answer

Sourcetree

Products

Interests

Groups

Community resources

Support

How to continue rebase after resolve conflicts

2 answers

1 accepted

Suggest an answer

Brian Ganninger

Tip from the team: configuring Git or Mercurial in Sourcetree

Atlassian User Groups

Find my local user group

Groups near you