VS Merge工具结果很糟糕 [英] VS Merge tool result is awful
问题描述
您好！
今天早些时候我尝试合并项目中的分支机构，发现内置合并工具真的很糟糕的合并结果进入VS2015，虽然比较工具运行完美，只显示了变化代码，而不是整个块，
我无法轻松合并'两次点击'。
这里有两个截图，来自合并工具和比较工具，你可以看到差异是巨大的。
Hello!
Earlier today I tried to merge branches in the project and found really awful merge result from the built-in merge tool into VS2015, although the compare tool works perfectly and shows me only the changes in the code, not the whole blocks, which
I can't merge easily in 'two clicks'.
Here are two screenshots, from the merge tool and the compare tool, as you can see the difference is enormous.
我尝试从VS和SourceTree工具合并 - 结果相同。
这是一个错误或其他什么？ 我怎么能改变什么？有时像这样合并，这非常简单，需要花费大量时间手动合并。
I tried did merge from the VS and the SourceTree tool - the same result.
That is a bug or something else? How I can change something? Sometimes merging like that, which is very simple, takes a lot of time to merge by hand.
推荐答案
Dmytro Bondarenko，
Hi Dmytro Bondarenko,
欢迎来到MSDN论坛。
Welcome to MSDN forum.
您可以使用VS合并冲突文件用手。
You can use VS to merge conflict files by hand.
- 点击后合并，请选择混合视图，以便您可以在结果窗口中修改冲突文件。
- 选择您想要的版本打开（源，目标或两者），然后在结果窗口中根据需要进行修改。
- 完成修改后，单击"接受合并所有冲突文件"。
点击提交合并 - >输入评论 - >提交暂存，然后您会发现文件保留您修改后的版本
Click Commit Merge -> input comment -> Commit Staged, then you will find files keep the version as you modified
最好的问候，
Joyce
这篇关于VS Merge工具结果很糟糕的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
