Visual Studio 2015 git冲突解决方案选项不起作用 [英] Visual Studio 2015 git conflict resolution options are not working

问题描述

Hi Team，

我们有一个带有Git存储库的TFS 2015。开发人员正在使用VS2013进行所有开发活动。  我们在过去2天遇到了奇怪的问题。

We have a TFS 2015 with Git repository. Developers are using VS2013 for all development activities.  We are facing strange issue from last 2 days.

我们正在合并2个分支，合并选项会产生冲突，我们正在尝试解决Visual Studio中的冲突。它给出了"Keep Source，Keep Target，Compare and Merge options"和"Keep Source，Keep Target，Compare and Merge options"。并且没有一个选项不起作用。点击任何选项
没有任何事情发生。  

We are doing merge of 2 branches, merge option gives conflicts and we are trying to resolve conflicts in Visual Studio. It gives "Keep Source , Keep Target , Compare and Merge options" and none of the options are not working. On click of any options nothing is happening.  

请帮助我们。我们陷入了错误更新。 

Please help us in this. We are stuck in bug updates. 

提前致谢，

$ hree

推荐答案

您好

这里，

感谢您的发帖。

我使用TFS2015 Update3和VS2013在我身边进行了测试。我可以成功解决冲突。

I did a test in my side using TFS2015 Update3 and VS2013. I can resolve the conflict successfully.

请尝试使用VS2015来解决冲突。结果怎么样？

Please try to use VS2015 to resolve the conflict. How about the result?

顺便提一下，请看一下下面关于"解决合并冲突"的文件

By the way, please take a look at the document below about "Resolve merge conflicts"

https://www.visualstudio.com/en-us/docs/git/tutorial/merging

最好的问候，

Lake Xiao

Lake Xiao

这篇关于Visual Studio 2015 git冲突解决方案选项不起作用的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！