If I do a right-click and "rebase current changes onto master" in Sourcetree, and then have conflicts, there seems to be no way to finish the process in Sourcetree. The only way I can figure it out (if and when I remember) is to resolve the conflicts using my external tool (BeyondCompare) then go to the command line and do "git rebase --continue", then go back into Sourcetree and do a force push of the branch I rebased.
Why doesn't Sourcetree have a visual equivalent of "git rebase --continue"?
Sourcetree has a git rebase --continue, but is sort of hidden under the Actions menu. I agree that it should a more intuitive way of doing it. There are a couple of issues logged for it, here a some that I found when searching: SRCTREE-1643 SRCTREE-2999
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.