Restore state from last commit only if undo is successful
Restore state from last commit only if undo is successful

Repro steps: 

open repo with merge conflict
click undo
see error (cannot do a soft reset in the middle of a merge)

expected: no change to commit message box
actual: commit message from last commit appears in box

atom/github,atom/github,atom/github