Summary

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.

Environment

SourceTree for Mac 2.2.3, 2.2.4

Steps to Reproduce

1. Initialize a git repo
2. Create a file and commit in master branch
3. Create branch develop
4. Edit file in develop and commit
5. Switch to master branch.
6. Edit file so that it creates a conflict with the version in develop branch
7. Commit in master branch
8. Right-click the commit in develop, select Rebase...
9. Confirm Rebase dialog appears, select OK
10. A new dialog appears, warning of the conflicts. Select Close
11. Merge Conflicts dialog appears, select OK
12. Click Commit button from the toolbar
13. A dialog Rebase In Progress appears, with buttons Abort Rebase, Cancel and Continue Rebase

Expected Results

Selecting Cancel should cancel Commit
Selecting Abort Rebase should abort the rebase

Actual Results

Selecting Cancel aborts the rebase
Selecting Abort Rebase cancels the Commit