Steps to reproduce

1. Create a new test repository locally in Sourcetree
2. Create and commit an empty file, test.txt
3. Add a line of content foobar to test.txt and commit the changes
4. Create and switch to a new branch called feature
5. Edit the line of content in test.txt to spamandeggs and commit the changes
6. Switch back to the master, amend the line of content in test.txt to foobarspaz and amend the latest commit (i.e. the commit from step 3), selecting OK to the sure changing history warning dialog
7. Switch to the feature branch and:
   1. right click on the latest commit on master and select the Rebase children of <hash> interactively option
   2. delete the commit that appears that corresponds to the commit in step 3
   3. hit OK

Expected results

The rebase conflicts, and Sourcetree allows me to edit and resolve the conflict and to continue the interactive rebase.

Actual results

The rebase conflicts and hitting Close on the interactive rebase dialog (see attached screenshot) aborts the rebase.

FWIW if from the command line I run git rebase -i master, resolve my conflict, and run git rebase --continue the rebase succeeds, so I'd expect I should be able to do the same from within Sourcetree.