TFS Visual Studio 2010中，某些类型的“合并工具选项”中没有显示“合并更改”。 如何启用它？
[英]TFS Visual studio 2010, I do not see Merge Changes in Merge Tool Option for some types. How can I enable it?
问题描述
when there is confilct on merging, merge tool option is not avaliable for some files, while it is avliable for other page type. 
当存在合并冲突时，某些文件不提供合并工具选项，而其他页面类型则可用。 check two screen shot below 检查下面的两个屏幕截图
Merge Changes in merge tool is not avaliable for aspx page type 合并工具中的合并更改不适用于aspx页面类型
merge changes in merge tool is avaliable for sln 合并工具中的合并更改适用于sln
1 个解决方案
解决方案1
0 2018-10-25 02:52:12
Just enable the option " Enable file merging and multiple check-out " for the file type *.aspx . 只需为文件类型*.aspx启用选项“ Enable file merging and multiple check-out ”即可。
For example in VS 2015 ( no vs 2010 on my side, it should be similar as vs 2015 ): 例如在VS 2015中（ 我这边没有vs 2010，应该与vs 2015类似 ）：
- Open Visual Studio --> Connect to your TFS server 打开Visual Studio->连接到TFS服务器
-
Team-->Team Project Collection Settings-->Source Control...Team->Team Project Collection Settings->Source Control... - Select the
Asp.net Files-->Edit选择Asp.net Files->Edit - Make sure the file type
*.aspxis added and the option "Enable file merging and multiple check-out" is enabled/checked确保添加了文件类型*.aspx，并且启用/选中Enable file merging and multiple check-out“Enable file merging and multiple check-out”选项 - Close and restart the Visual Studio, then try it again, the
Merge Changes in Merge Tooloption will show up now.关闭并重新启动 Visual Studio，然后重试，现在将显示“ Merge Changes in Merge Tool的Merge Changes in Merge Tool选项。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.