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.

  • Keep commit message subject under 50 characters in SourceTree
  • How to add icon to my repository?
  • how to know the branch name from the graph line in git?
  • SourceTree for Windows not working
  • For bitbucket, what is the difference between having a team work on a repo and having a personal repo that everyone on the team works on?
  • .gitignore exception is including extra files
  • 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?

  • Recovering files removed by GIT (only in original copy)
  • How to recover files added to git but overwritten by checkout
  • Change file permissions using elasticbeanstalk config file
  • Show Current Git Branch in Xcode 4.2
  • Using Qt Creator with Git version control
  • Update pre_commit hook file on version control
  • 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.