git stash之后从master新建issue分支修复并且合并到master中，然后要回到dev分支恢复现场的时候，会提示

“error: Your local changes to the following files would be overwritten by merge:

    readme.txt

Please, commit your changes or stash them before you can merge.

Aborting”

是不是因为在恢复现场之前要把修复的内容同步到dev分支？