Menu
In the latest version of source tree, after you have resolved the conflict and have all of your changes in the staging area, you have to commit first and then click on Actions -> Continue Rebase.
There are two ways to start an interactive rebase in Sourcetree. The first is to right-click (or context-click) on a commit and choose Rebase children of <sha> interactively. The second is to pull down the Repository menu and select Interactive rebase.
For merge branch in Sourcetree you just need right click in the branch commit that you want and choose the option Merge. If you have some conflict you can also fix it by right clicking in the conflicted file, select the Resolve Conflicts and pick the desired option.
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:
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:
In the latest version of source tree, after you have resolved the conflict and have all of your changes in the staging area, you have to commit first and then click on Actions -> Continue Rebase.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With