git pull 报错

idea 上将本地代码推送到 git后 , 报错如下图

error: Your local changes to the following files would be overwritten by merge:
        src/main/resources/application-prod.properties
Please, commit your changes or stash them before you can merge.

解决方法 ：保留本地最新修改，并拉取仓库中忘记 pull 的代码到本地

三个命令

git stash  
git pull origin master  
git stash pop