文章内容
2016/12/23 11:23:25,作 者: 黄兵
Git in Visual Studio. Conflict prevents checkout
I am using git in Visual studio. When I am trying to synchronize, the following message appears.
注解：我在Visual Studio中使用git。 当我尝试同步时，显示以下消息。
An error occured. Detailed message: An error was raised by libgit2. Cetegory = checkout(MergeConflict). 1 conflicts prevent checkout
注解：发生错误。 详细消息：libgit2引发了错误。 Category = checkout（MergeConflict）。 1冲突防止检出
And I have not even a clue about what the conflicts are, and how to fix them. This is however really annoyng. Could you please help me with that?
注解：我对于什么是冲突一点都不知道，以及如何解决它们。 你能帮助我吗？
--------------------------------------------------------------------------------------------------------
I have solved the same problem by using the Git command prompt in Visual Studio, because it gives you more ability:
注解：我已经在Visual Studio中使用Git命令提示符解决了相同的问题，下面的链接你可以参考：
http://msdn.microsoft.com/en-us/library/vstudio/dd286572.aspx
You also may install this extension to facilitate the work with it (it gives you ability do not enter passwords each time):
注解：您也可以安装此扩展以方便工作（谈能够使你每次不需要输入密码）：
http://gitcredentialstore.codeplex.com/
Then I used this commands:
注解：然后使用下面命令：
git pull // I got an error on this step
git stash
git pull
more information about commands here:
注解：想了解更多命令参考一下链接：
http://git-scm.com/docs/git-pull
http://git-scm.com/book/en/Git-Tools-Stashing
http://git-scm.com/docs/git-commit
And as CharlesB said it is due to "conflict between your changes and the changes from another branch".
注解：正如CharlesB所说，这是由于“你的分支产生改变另外一个分支也发生改变，两个分支之间就产生了冲突”。
m.fanti1999.com on 回复 有用（0）
解决了我的问题，谢谢博主。