合并/丢弃报告“无待处理的更改”当 /candidate 向他们展示时
我正在尝试运行 merge /discard 命令（tfs merge /discard /version:nnn:yyy $/sourceproj $/targetproj /recursive），但它说有没有待处理的更改。
如果我运行 tfs merge /candidate $/sourceproj $/targetproj 它会将相关变更集显示为候选。
有什么想法为什么会发生这种情况以及如何解决它吗？
谢谢。
I'm trying to run a merge /discard command (tfs merge /discard /version:nnn:yyy $/sourceproj $/targetproj /recursive) but it says there are no pending changes.
If I run a tfs merge /candidate $/sourceproj $/targetproj it shows the relevant changesets as candidates.
any ideas why this happens and how to get round it?
Thanks.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
如果您知道确切的变更集编号，请尝试：
tf merge /discard /version:C111~C111 BranchX BranchY /recursive
这假设您知道变更集编号（在本例中为 111）。
如果这不起作用，那么您可以更新您的问题以提供您输入的确切值以及候选检查的输出吗？
If you know the exact changeset number try:
tf merge /discard /version:C111~C111 BranchX BranchY /recursive
This assumes you know the changeset number (in this case 111).
If that doesn't work, then can you update your question to give the exact values you are entering along with the output for the candidate check?
您可能隐藏/未映射一些受合并候选者影响的目标路径。由于没有可以签出进行合并的文件，因此这些文件将被忽略，从而导致奇怪的行为。
考虑以下结构：
当变更集包含
/branch-A/SomeFolder和/branch-A/OtherFolder并且您尝试在此从branch-A合并到branch-Main时工作区中，只有SomeFolder将被合并，导致变更集部分合并，从而再次作为候选出现。在您将/branch-Main/OtherFolder映射到工作区之前，您将永远无法合并（或合并/放弃）OtherFolder 的更改。顺便说一句：通常，合并时只有合并目标路径必须映射到工作区中，因此您可以很好地将
/branch-Main/OtherFolder合并到/branch-A/OtherFolder在上面的示例工作区中。You may have cloaked/not mapped some of the target paths that are affected by the merge candidate. As there is no file that could be checked out for the merge, those files will ignored, resulting in the strange behaviour.
Consider this structure:
When the changeset contains
/branch-A/SomeFolderand/branch-A/OtherFolderand you try to merge from branch-A to branch-Main in this workspace, onlySomeFolderwill be merged, resulting in a partial merge of the changeset and thus appearing again as candidate. You will never be able to merge (or merge/discard) the changes for OtherFolder until you map/branch-Main/OtherFolderin your workspace.BTW: Generally only the merge TARGET paths must be mapped in a workspace when merging, so you could very well merge
/branch-Main/OtherFolderto/branch-A/OtherFolderin the sample workspace above.