2

In one of my branches I deleted some folders on purpose which contain plug-in sources that shouldn't be available for most of the developers using this branch. When merging new revisions from trunk to branch, i am always getting tree conflicts which i just resolve.

How can I tell svn (TortoiseSVN 1.7.6) to just ignore these deleted folders and tree conflicts in the future to speed up my merging process?

4

1 回答 1

0

你不能，至少不能自动。

但是，您可以将包含从您的分支中删除的修订合并到主干中，以便主干知道这些文件夹已被删除。然后，当您从主干向上合并到其他分支时，变化将波及它们。

当您需要将原始分支合并回主干时，您将需要挑选要合并的修订，除了包含删除的修订（顺序合并）或执行差异合并。第三种选择是进行重新集成合并，但是（如果您打算继续在分支上工作）您应该在合并后删除并重新创建分支，以避免稍后涉及该分支的奇怪合并问题。

希望这可以帮助。

于 2012-05-27T23:40:59.390 回答