Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled

git rebase atlassian-sourcetree merge-conflict-resolution
user4007604 picture user4007604 · Sep 17, 2014 · Viewed 23.1k times · Source

I'm using SourceTree as my git tool on Windows.

I have a main branch and a feature branch and I can't get SourceTree to perform a rebase when I have a conflict.

main looks like:

c1 -> c2 -> c4 -> c5

feature looks like:

c1-> c2 -> c3

I want to rebase feature so it will be:

c1 -> c2-> c4-> c5-> c3

There is a conflict between c3 and c5. I can resolve the conflict, but when I commit the changes I get a HEAD tag and looking at my graph I can see that feature branch wasn't rebased.

How can I get the rebase to work?

Answer

Philip Pittle picture Philip Pittle · Sep 17, 2014

Unfortunately the UX path for the resolving conflicts during a rebase is quite poor in .

After you have resolved the conflict and have all of your changes in the staging area, instead of clicking commit, go to Actions-> Continue Rebase:

enter image description here

Related questions

How to properly rebase in SourceTree?

SourceTree 1.6.4.0 on Windows 7. Let's say the following is my starting point: C <- master / - A - B <- topic I want to rebase topic onto master. My goal is to have: C - A - B ^ ^ master …

Read More
Squash my last X commits together using Git

How can I squash my last X commits together into one commit using Git?

Read More
Git refusing to merge unrelated histories on rebase

During git rebase origin/development the following error message is shown from Git: fatal: refusing to merge unrelated histories Error redoing merge 1234deadbeef1234deadbeef My Git version is 2.9.0. It used to work fine in the previous version. How can I …

Read More