git 1 个未提交的更改将被 Visual Studio 2013 中的合并覆盖
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/36026857/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me):
StackOverFlow
1 uncommitted change would be overwritten by merge in visual studio 2013
提问by ani
while i am trying to pull a source to git it shows error as follows"An error occurred. Detailed message: 1 uncommitted change would be overwritten by merge"
当我尝试将源提取到 git 时，它显示如下错误“发生错误。详细消息：1 个未提交的更改将被合并覆盖”
I searched and tried those things like: commit in local repository and pull remove the untracked files
我搜索并尝试了以下内容：在本地存储库中提交并删除未跟踪的文件
Both not worked for me.
两者都不适合我。
回答by Taj Ahmed
do a stash before pull your changes ,no need to create a new commit to pull new changes
在拉取更改之前进行存储，无需创建新提交来拉取新更改
git stash;
git pull origin master;
git stash pop;
Nicely explained in
很好地解释了
回答by Mark
I did the following and it cleared things up nicely:
我做了以下事情，它很好地解决了问题：
git status
git pull
