简体   繁体   English

Visual Studio 2015:Git Diff工具窗口为空

[英]Visual Studio 2015: Git Diff Tool Window is empty

I am using Microsoft Visual Studio Community 2015 (Version 14.0.23107.0) and Visual Studio Online with Git. 我正在使用Microsoft Visual Studio社区2015(版本14.0.23107.0)和Visual Studio Online与Git。 When I right click on a file in Solution Explorer and select "Compare with Unmodified", a new Window opens, which is empty. 当我右键单击解决方案资源管理器中的文件并选择“与未修改比较”时,将打开一个新窗口,该窗口为空。 The Tab on top of the editor window is on the right side. 编辑器窗口顶部的选项卡位于右侧。 When I hover the mouse over it, it says: "Preview of: Filename", while there is still a tab on the left for the original window "Filename". 当我将鼠标悬停在它上面时,它会显示:“预览:文件名”,而左侧仍有一个标签,用于原始窗口“文件名”。

In Team Explorer, Settings, Git, Global Settings it says: Diff Tool: Visual Studio | 在团队资源管理器,设置,Git,全局设置中,它说:Diff Tool:Visual Studio | GLobal 全球

It says the same in Repository Settings 它在存储库设置中也是如此

I remember that some time ago I could make here a selection and I clicked on "Visual Studio". 我记得前段时间我可以在这里选择一个,然后点击“Visual Studio”。 Now it is read only. 现在它是只读的。

I get the same empty window when I try to investigate a merge conflict or when I try to see how a file in a commit has changed "Compare with Previous ...". 当我尝试调查合并冲突或当我试图查看提交中的文件如何更改“与上一个...比较”时,我得到相同的空窗口。

What do I need to do to get the Diff Tool work properly ? 我需要做些什么才能使Diff Tool正常工作?

It's a bug that happens when you have the option "Enter outlining mode when files open" disabled (it's in "Tools -> Options -> Text Editor -> C# -> Advanced" ). 如果您选择禁用文件打开时输入大纲模式”选项,则会出现错误(在“工具 - >选项 - >文本编辑器 - > C# - >高级”中 )。 Until it's fixed, enabling that option should make the diff tool work again. 在修复之前,启用该选项应该使diff工具再次工作。

See the answer from Chris S. Nissen here: https://social.msdn.microsoft.com/Forums/vstudio/en-US/00bb6e4e-1e3c-40e4-ba09-479d67e622e2/blank-compare-window-in-vs-2015-rc-for-c-files?forum=tfsversioncontrol 请参阅Chris S. Nissen的答案: https//social.msdn.microsoft.com/Forums/vstudio/en-US/00bb6e4e-1e3c-40e4-ba09-479d67e622e2/blank-compare-window-in-vs- 2015年-RC-的-C-文件?论坛= tfsversioncontrol

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM