If a user attempts to make a commit while in the middle of a rebase, a Rebase in Progress dialog will pop up, with 3 buttons: Cancel, Abort Rebase, Continue Rebase.
Selecting Cancel aborts the rebase while selecting Abort rebase cancels the Commit.
SourceTree for Mac 2.2.3, 2.2.4
- Initialize a git repo
- Create a file and commit in master branch
- Create branch develop
- Edit file in develop and commit
- Switch to master branch.
- Edit file so that it creates a conflict with the version in develop branch
- Commit in master branch
- Right-click the commit in develop, select Rebase...
- Confirm Rebase dialog appears, select OK
- A new dialog appears, warning of the conflicts. Select Close
- Merge Conflicts dialog appears, select OK
- Click Commit button from the toolbar
- A dialog Rebase In Progress appears, with buttons Abort Rebase, Cancel and Continue Rebase
Selecting Cancel should cancel Commit
Selecting Abort Rebase should abort the rebase
Selecting Cancel aborts the rebase
Selecting Abort Rebase cancels the Commit