GRI hangs

From Todd Bluhm on AAC here: https://answers.atlassian.com/questions/173127/interactive-rebase-hangs?page=1#211123

"Hey Kieran,

I have run into the exact same issue as @Greg originally posted. I started an interactive rebase ran into some conflicts, fixed them, then continued the rebase and it just sits there spining forever. It doesn't hang so much as it just doesn't ever finish, so no crash logs, but an intersting notifcation does pop up in the console as soon as I continue the rebase, the message is "9/12/13 1:59:19.411 AM SourceTree[967]: File has no contents"

Sourcetree version: Version 1.6.4.1 (1.6.4.1)

Git Embedded Version: 1.7.11.1

Repo Path: /Users/toddbluhm/Development/JourneyScholar/Lessontrek/code

SourceTree Path: /Applications/SourceTree"