TFS 2010 想要分支/合并每个文件
我们刚刚升级到TFS 2010。我们为每个项目创建了一个开发分支。如果在 Branch1 中进行更改，然后将 Branch1 合并回基线，它将合并每个文件，而不仅仅是更改的文件。
对 Branch1 中文件的后续更改然后合并到基线只会导致这些更改被合并（这就是我们想要的）除非来自 Branch2 的更改在 Branch1 的第一次和第二次合并之间合并，然后每个文件都会再次合并（我们不希望这样）。
我们怎样才能做到每次只合并更改的文件？
We just upgraded to TFS 2010. We created a development branch for each project. If changes are made in Branch1 and then Branch1 is merged back into the baseline, it merges every file instead of just the changed files.
Subsequent changes to files in Branch1 and then merging to the baseline result in only those changes being merged (which is what we want) unless changes from Branch2 were merged in between the first and second merge of Branch1, then every file merges again (which we don't want).
How can we make it so only changed files get merged everytime?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
您可以尝试合并特定的更改集，而不是合并最新的更改集。这样，您甚至可以控制将哪些更改合并到其他分支中，而不是同时合并所有更改。
此外，当没有更改时，自动合并应该处理文件而不会产生任何问题。您面临哪些具体问题？
You can try to merge specific change sets instead of upto the latest change sets. That way you can even control which changes get merged into other branches instead of all changes being merged at the same time.
Also, when there are no changes, the automerge should take care of the files without creating any problems. What specific problems are you facing?
我认为问题在于我们创建了开发分支，然后删除了它们，然后重新创建了它们。我们过去遇到过类似的问题，删除了一个文件，然后添加了一个同名的新文件。过去问题的解决方法是进行无根据的合并。我们没有经历这个过程，而是决定删除开发分支并用不同的名称重新分支它们。
I believe the problem was that we had created the development branches, then deleted them, then recreated them. We ran into a problem similar to this in the past where a file was deleted, then a new file was added with the same name. The fix for the past problem was to do a baseless merge. Rather than go through that we decided to just delete the development branches and rebranch them with different names.