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 //合併暫存的代碼