TFS 将变更集合并到具有待定变更的文件中 [英] TFS merge changeset into file with pending change

问题描述

我觉得这是一个非常愚蠢的问题，但我在任何地方都找不到答案.

I have a feeling this is a very stupid question, but I can't find the answer anywhere.

所以我们有一个 Dev 分支和一个 QA 分支.我将 Dev 中的一堆连续变更集合并到 QA 中，并解决了冲突.现在我想在稍后的变更集中合并我刚刚合并的更改(没有签入第一次合并的更改).没有骰子，TFS 说:

So we have a Dev branch and a QA branch. I merge a bunch of contiguous changesets from Dev into QA, and resolve conflicts. Now I want to merge in a later changeset, over the changes I just merged (not having checked in the changes from the first merge). No dice, says TFS:

The item $/My/Path/to/the/file.vb has an incompatible pending change.

它有什么问题?为什么它不给我一个合并冲突选项来将新的变更集合并到带有待处理变更的文件中?我不想签入第一次合并，只是为了可以合并到另一个变更集.

What's its problem? Why won't it give me a merge conflict option to merge the new changeset to the files with the pending changes? I don't want to check in the first merge just so I can merge in another changeset.

推荐答案

如果在两个不连续的变更集中更改了同一个文件，TFS 不允许您合并多个不连续的变更集.最好的选择是签入第一组更改，然后进行合并.

TFS doesn't allow you to merge multiple non-contiguous changesets if the same file is changed in both of them. Your best option is to checkin the first set of changes, then do the merge.

这篇关于TFS 将变更集合并到具有待定变更的文件中的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！