git pull 本地冲突

用git pull来更新代码的时候，遇到了下面的问题：
error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.php Please, commit your changes or stash them before you can merge. Aborting...

解决办法:
git stash //暂存当前正在进行的工做
git pull
git stash pop //合并暂存的代码