用于合并帮助的Visual Studio 2017 C ++ UI请 [英] Visual Studio 2017 C++ UI for Merge Help Please
问题描述
我试图理解在Visual Studio 2017 C ++中与团队资源管理器合并。 当我按下合并按钮并且存在冲突时,我得到一个看起来像这样的UI(当然它是图形的):
I was trying to understand merging with team explorer in Visual Studio 2017 C++. When I press the merge button and there is a conflict I get a UI that looks like so (of course it is graphical):
冲突的内容更改
比较文件
在mybranch上编辑| diff | take source
在master上编辑| diff | keep target
我想了解最后两行。 什么 diff 做什么和 采取
来源 和 保持目标 do。 还有 什么是
编辑 分支 ?
I am trying to understand the last two lines. What diff does and what take source and keep target do. Also what is edited on branch?
谢谢你,
Josheir
Josheir
推荐答案
使用Visual C ++ 2017 C ++团队资源管理器如何模拟合并以理解协调冲突的过程?
Using Visual C++ 2017 C++ Team Explorer how can I simulate a merge to understand the process of reconciling a conflict?
谢谢你,
Josheir
Josheir
这篇关于用于合并帮助的Visual Studio 2017 C ++ UI请的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!