使用git pull命令的时候报错：
error: Your local changes to the following files would be overwritten by merge: project/src/main/resources/db.properties Please, commit your changes or stash them before you can merge. Aborting
解决方法
git reset --hard git pull origin master
注意把master换成你正用的分支名称。
