SourceTree - rebase - Errors During Merge
问题 I'm trying to do something simple like editing the commit message for a previous commit. Checking git status I have: nothing to commit, working directory clean I then click on the commit and do SourceTree > Repository > Interactive Rebase... but get this dialog box, and a completely blank/empty description area: Note: I read somewhere that this might be due to FileMerge creating a .orig backup file. However, looking through FileMerge preferences I don't see anything about backup files 回答1: