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:
