Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,456,628
Community Members
 
Community Events
176
Community Groups

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

12 votes
Answer 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

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.

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
TAGS

Atlassian Community Events