使用git pull命令的时候报错: 纯文本复制 1234 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 解决方法 Bash复制 12 git reset --hard git …

