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.

  • SourceTree password after opening Bitbucket account with gmail
  • Git rebasing not working correctly?
  • Sourcetree remote: Invalid username or password
  • Can Git software (e.g. Gitbox, Github, SourceTree) use a remote repo instead of local?
  • Create a git diff of a file from SourceTree
  • Install SourceTree without an Atlassian account?
  • 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?

  • Can't commit update-index on Windows
  • Git ignore: How to match one or more digits
  • GIT: How to see pulled/pushed changes in origin
  • Location of app when pushed to Heroku
  • linking github to my server
  • How can I get Emacs to revert all unchanged buffers when switching branches in git?
  • 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.