TFS 将变更集合并到具有挂起变更的文件中
我感觉这是一个非常愚蠢的问题，但我在任何地方都找不到答案。
所以我们有一个 Dev 分支和一个 QA 分支。我将开发中的一堆连续变更集合并到 QA 中，并解决冲突。现在我想合并到稍后的变更集中，覆盖我刚刚合并的更改（没有签入第一次合并的更改）。 TFS 说，没有骰子：
The item $/My/Path/to/the/file.vb has an incompatible pending change.
它的问题是什么？为什么它不给我一个合并冲突选项来将新的变更集合并到具有挂起的更改的文件中？我不想只是为了合并另一个变更集而签入第一次合并。
I have a feeling this is a very stupid question, but I can't find the answer anywhere.
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.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（4）
如果同一个文件在多个不连续的变更集中都发生了更改，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.
我也有同样的问题。我确实撤消了所有待处理的本地更改，并取消搁置了待处理的更改。它解决了我的问题。
I had the same problem. I did undo all the pending local changes and un-shelved the pending changes. It fixed my problems.
我由于不同的原因遇到了同样的问题，因为我偶然在这里寻求帮助，所以我会给出我的解决方案。
我有一个从 main 分支的分支 (branched_from_main)。我对branched_from_main 进行了更改，并将它们签入 tfs 存储库。然后，当我尝试将branched_from_main合并回main时，我遇到了这个问题。研究了一段时间后，我意识到我已经打开了主要解决方案并构建了它。这意味着该解决方案现在已删除所有 nuget 软件包。因此，我的主要分支正在考虑将这些包视为待更改。
因此，为了解决这个问题，我必须重新打开主要解决方案并撤消那些未决的更改。然后我能够将branched_from_main合并回main。
I was experiencing this same issue for a different reason and since I stumbled here for help I will give my solution.
I had a branch (branched_from_main) that was branched from main. I made changes to branched_from_main and checked them into the tfs repo. Then when I tried to merge branched_from_main back to main I was experiencing this issue. After looking into it for a while I realized that I had opened the main solution and built it. This meant that the solution now pulled down all of the nuget packages. Thus my main branch was considering the packages as pending changes.
So to fix the issue I had to reopen the main solution and undo those pending changes. Then I was able to merge branched_from_main back to main.
签入您要分支到的文件夹就足够了。
就我而言，我在目标分支中创建了一个新文件夹，它处于“添加”状态（无需签入），并且我遇到了同样的问题。我签入该文件夹后，效果很好。
It is enough to check-in the folder that you are going to branch to.
In my case I created a new folder in my target branch and it was on the "Add" state (without check-in) and I had this same problem. After I checked in this folder it worked well.