Visual Studio 2012 RC Diff 实用程序是否仅进行比较? [英] Is the Visual Studio 2012 RC Diff Utility Compare-Only?

问题描述

我发誓，在早期版本的预览版/测试版/无论什么版本中，我不仅能够查看两个文件之间的差异，还能够合并/更新.现在我正在查看一个差异窗口，据我所知，无法从左到右或从右到左移动线.

I swear that in earlier versions of the preview/beta/whatever I was not only able to view the difference between two files, but also merge/update. Now I'm looking at a diff window and as far as I can tell there is no way to move lines from left to right, or right to left.

窗口底部有一个帮助"链接，指向这个page 不幸的是没有涵盖任何类型的合并.目前我能做的唯一方法是手动复制和粘贴，或将左侧的文本输入到右侧的窗格中.

The window has a "Help" link at the bottom, leading to this page which, unfortunately has no coverage of any kind of merge. The only way I can do it at the moment is to manually copy and paste, or type the text on the left into the pane on the right.

Microsoft 是否删除了这些选择仅比较"差异实用程序的功能?

Did Microsoft remove these features opting for a "compare-only" diff utility?

这些工具是否可以在我不看的地方使用?

Are these tools available somewhere I'm not looking?

是否有可能我的安装已损坏?任何人都可以确认他们不仅可以比较，还可以使用 RC 进行更新.

Is it possible my installation is corrupted? Can anyone confirm that they can not only compare, but also update using the RC.

推荐答案

比较工具(我相信)没有任何合并选项.但是，如果您在源代码管理资源管理器中右键单击一个文件并转到 Branching &合并 > 合并 您可以在任意两个文件之间执行无根据的合并(您必须浏览文件)，并解决合并工具内的冲突.希望有所帮助.

The compare tool (I believe) doesn't have any merge options. However, if you right-click on a file in source control explorer and go to Branching & Merging > Merge you can perform a baseless merge between any two files (you have to browse for the file), and resolve conflicts within the merge tool. Hope that helps.

这篇关于Visual Studio 2012 RC Diff 实用程序是否仅进行比较?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！