问题描述
我们需要删除一个分支中的文件夹，但不希望在主/根存储库中删除该文件夹。删除的文件夹在一个旧版本中消失了，但是较新版本和旧版本中都保留了它。
We need to delete a folder in one of our branches, but do not want it deleted in the main/root repository. The deleted folder is gone in ONE older version, but the newer versions retain it, as do the older versions.
我在分支中将其删除，合并到main中，然后在main中，该文件夹上没有撤消未决的更改。问题是每个新合并到main，它想再次删除该文件夹。我如何告诉它将其保留在主目录/根目录中？
I deleted it in the branch, merged to main, then in main did "undo pending changes" on that folder. The problem is each new merge to main, it wants to delete that folder again. How do I tell it to leave it in the main/root?
推荐答案
要防止变更集被合并，您需要它。
To prevent a changeset from being merged, you need to discard it. This is done from the Command Prompt.
tf merge /discard /version:C137 branch1 branch2 /recursive
这篇关于如何删除TFS分支中的文件夹，而不是主要部分中的文件夹？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！