Using git flow - I try to close a hotfix.

I get a merge conflict - I then right click and resolve the merge conflict.

Source tree automatically makes a commit (I DONT WANT THIS).

If i try to delete the hotfix branch, sourcetree does not let me because it says the hotfix branch isn't fully merged in yet.

If I click the Commit button in the top right I can see there is still a pre-populated message with the conflicts from the auto commit.

I go ahead and do a blank commit(no files) with this pre-populated message.

I can now finally close the hotfix (without using the 'force' option).