git pull 出错，error: Your local changes to the following files would be overwritten by merge...

$ git stash
Saved working directory and index state WIP on master: c1f1d12 Merge branch 'master' of http://github.com/username/projectname


如果出现git merge 请编写git merge的必要性，直接 “ :q ” 退出就行。
-------------------------------------------------------------------------------------------
Please enter a commit message to explain why this merge is necessary,especially if it merges an updated upstream into a topic branch
-------------------------------------------------------------------------------------------


$ git pull
Merge made by the 'recursive' strategy.
 test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

https://www.cnblogs.com/visuals/p/4840162.html