Using the source tree, rebase with conflict, rebase does not work after the conflict has been changed

Question

I am using SourceTree as my git tool on Windows.

I have a main branch and a function branch, and I cannot get SourceTree to reinstall when I have a conflict.

main looks like this:

c1 → c2 → c4 → c5

the function is as follows:

c1-> c2 → c3

I want to reinstall the function so that it is:

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 the HEAD tag and look at my schedule. I see that the function branch has not been reinstalled.

How can I make rebase work?

Answer 1

Unfortunately, the UX path for resolving conflicts during reinstallation is pretty bad in atlassian-sourcetree .

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