I'm simply trying to edit a commit message:

• Highlight latest commit (topmost) on my branch
• Select Respository - Interactive Rebase
• Highlight latest (topmost) commit
• Press Edit Message
• Enter new text in the dialog that pops up
• Press OK takes me back to Interactive rebase
• Press OK to commit my change
• The Rebasing interactively window gives me a merge conflict error

See attached for the git output.

I did it via the command line with `git rebase --interactive` and it worked fine.