解决冲突后，强制在TFS中进行合并 [英] Force a merge in TFS after conflicts have been resolved
问题描述
TFS 2010，VS 2010
TFS 2010, VS 2010
我们在TFS中遇到一种情况，开发人员未遵循正确的合并过程.当我将他的开发人员目录与主干进行比较时，我得到了许多标记为不同或完全不在主干中的文件.他上次对中继的合并/签到是在2011-05-26，而对他的dev分支的最后签到是在2011-05-25.
We have a situation in TFS where a developer has not been following proper merge procedure. When I run a compare of his developer directory against trunk, I get a number of files marked as either different or not in trunk at all. The last merge/check-in to trunk was by him on 2011-05-26, and his last check-in to his dev branch was 2011-05-25.
我相信发生了两件事:
I believe two things are going on:
-
他没有从主干正确地更新他的dev分支(我们要求开发人员合并主干-> dev分支并在合并dev->主干之前进行编译)
He isn't updating his dev branch from trunk properly (we require developers to merge trunk -> dev branch and compile before merging dev -> trunk)
他没有正确解决合并冲突
He isn't resolving merge conflicts correctly
问题在于，一旦他将冲突标记为已解决，随后的合并就会忽略这些差异.我需要强制进行合并，以重新查看整个文件中的差异，以便可以手动更新他所做的每个更改.
The problem is that once he's marked conflicts as resolved, subsequent merges ignore those differences. I need to force a merge that revisits the differences from the whole file so that I can manually update every change he's made.
我该怎么做?
推荐答案
您需要转到命令行并使用tf merge /force，例如tf merge $/TeamProject/DevBranch $/TeamProject/Trunk /force这应该做您想要的.
You need to go to the command line and use tf merge /force e.g. tf merge $/TeamProject/DevBranch $/TeamProject/Trunk /force This should do what you want.
有关更多信息，请尝试tf msdn，它将打开浏览器并带您到tf命令工具的联机帮助.
for more info try tf msdn which will open a browser and take you to the online help for the tf command tools.
/recursive修复了所有问题并显示了GUI冲突.
/recursive fixes all and displays the GUI for conflicts.
这篇关于解决冲突后，强制在TFS中进行合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
