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

问题描述

所以，我不知道是否有人注意到，但与VS2012打包的新合并工具生病了 - 我最近移动到我的源代码控制Git，真的想能够设置VS2012作为我的默认difftool / mergetool。

任何关于如何做的建议这个？如果可能的话，我宁愿差异/合并在活动的VS2012窗口中开始，而不是一个新的实例。

如果你正在使用Visual Studio的 Git Source Control Provider ，它看起来像此功能已实施，并且自1.0.0版本开始提供。

或者如果您开始使用微软的 git工具 ，这也将使用内置的diff工具。从部分屏幕截图中，它看起来像是双向合并，结果在底部。

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.

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.

解决方案

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.

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.

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