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

Question

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

Answer 1

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

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: