write a wrong command
change the wrong command
modified commit command parameter
modified wrong commit command
after stash
revert to modified commit xxx
xxxx
1
2
3
asdfasdfa
fix conflict