It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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 smile

Screen_Shot_2016-02-04_at_6_59_07_PM.png

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
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

676 views 0 9
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you