Git-181006-本地pull代码和远端代码merge冲突

Problem

$ git pull
error: Your local changes to the following files would be overwritten by merge:

Solution

git stash
git pull origin master
git stash pop

Reference

git pull遇到错误：error: Your local changes to the following files would be overwritten by merge: