如何指定GIT拉必須忽略一些未提交的本地更改？

Question

從Git倉庫，我得到這個錯誤訊息拉：

$ git pull 
remote: Counting objects: 19, done. 
remote: Compressing objects: 100% (16/16), done. 
remote: Total 19 (delta 5), reused 0 (delta 0) 
Unpacking objects: 100% (19/19), done. 
From https://bitbucket.org/xxx/my-project 
    4910263..fd2a59b master  -> origin/master 
error: Your local changes to the following files would be overwritten by merge: 
     my-project/src/main/synapse-config/api/xxxTest.xml 
Please commit your changes or stash them before you merge. 
Aborting 
Updating 4910263..fd2a59b 

我認爲這取決於的事實，有我的本地版本的一些不觸犯輕微變化。我怎麼能說git忽略我的本地更改，並從遠程存儲庫中取出所有內容？

Answer 1

把它們藏在git要求你做的時候，做拉，然後藏起來。