当在用git pull时，出现了如下问题：
error: Your local changes to the following files would be overwritten by merge: XXXX文件 Please, commit your changes or stash them before you can merge. Aborting
执行git checkout -f，然后再执行git pull重新获取代码库的最新代码