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

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?

  • Really flatten a git merge
  • Accidently made further commits during interactive rebase (edit)
  • Git and management rebase of branches
  • How to squash with git rebase -i
  • How can I combine two commits into one commit?
  • git workflow: throwaway merges and git-rerere - what's the point?
  • How to fix conflicts after rebase and push them
  • the correct way of git rebase
  • One Solution collect form web for “Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled”

    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:

    enter image description here

    Git Baby is a git and github fan, let's start git clone.