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

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要求你这样做，然后拉动然后存放pop。