nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

How to continue rebase after resolve conflicts

Ralph Callaway

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

Accepted answers

Cherny D. C. Be1

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

All comments

Cherny D. C. Be1

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

Wouter Vos

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.

Patrick Little_hih4x8

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.

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree