在 Git 中使用 Visual Studio 2012 的内置合并工具 [英] Using Visual Studio 2012's built-in merge tool with Git

问题描述

所以，我不知道有没有人注意到，但与 VS2012 一起打包的新 Merge Tool 已经病入膏肓了.我最近转向 Git 进行源代码管理，并且真的希望能够将 VS2012 设置为我的默认 difftool/mergetool.

So, I don't know if anyone's noticed but the new Merge Tool packaged with VS2012 is sick-o to the max. I've recently moved to Git for my source control and really want to be able to set up VS2012 as my default difftool/mergetool.

有关如何执行此操作的任何建议?如果可能，我宁愿在活动的 VS2012 窗口中启动差异/合并，而不是在新实例中启动.

Any suggestions as to how to do this? I'd rather the diff/merge is started in the active VS2012 window and not a new instance if possible.

推荐答案

如果您使用的是 Git Source Control Provider 在 Visual Studio 中，此功能是已实现并从 1.0.0 版开始可用.

If you are using Git Source Control Provider with Visual Studio, it looks like this feature was implemented and is available as of version 1.0.0.

或者如果你开始使用 Microsoft 的 git 工具，这也将使用内置的差异工具.从一些截图，看起来它会进行 2 路合并，结果在底部.

Or if you start using Microsoft's tools for git, that will also use the built-in diff tool. From some of the screenshots, it looks like it'll 2-way merge, with the result at the bottom.

这篇关于在 Git 中使用 Visual Studio 2012 的内置合并工具的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！