TFS：分支、标签还是货架？
我对 TFS 还很陌生，但我对 VSS 有一些经验。我想知道您对在以下场景中使用 TFS 的最佳方式有何看法： 我们是一群致力于项目的开发人员。所有项目都从通用的基本代码开始。所有项目都只有一个人，在项目完成之前不共享代码。一个项目可以持续几个小时到几个月，在完成之前不会合并任何代码。任何开发人员都会同时处理多个项目，通常一次处理 7-10 个项目。通常，项目仅涉及少量更改/创建的文件 (10-20)，但依赖于大量经常更改的基础架构文件。但是，在合并之前不会考虑基础设施的任何更改，因此在最终构建之前我们不会从服务器获取最新版本。
另一个要求是，在合并时，我们希望使用 3 路合并工具。我们通过定制的应用程序在 VSS 中使用这种方法，效果非常好。然而，这涉及特殊的文件管理，例如，必须更改的每个文件都必须在某处保存原始版本，该版本将用作三向合并过程的“根”文件。
你怎么认为？
I am pretty new to TFS but I have some experience with VSS. I like to know your opinions of what would be the best way of working with TFS in the following scenario:
We are a group of developers working on projects. All projects starts from a common base code. All projects are one man only, no code sharing until the project is done. A project can last from a few hours to several months, no code is merged until done. Any developer works simultaneously on more than one project, usually 7-10 projects at a time. Usually the projects only involve a small numbers of files that are changed/created (10-20) but rely on a large group of infrastructure files that change quite often. However, any change in infrastructure is not considered until the merge, so we don't get latest version from server until the final build.
An additional request is that, when merged, we’d like to use a 3 way merge tool. We use this approach in VSS, via a custom made application and it works very well. However this involves special file management, for example every file that has to be changed must have an original version saved somewhere that will be used as the “root” file for the 3 way merge process.
What do you think?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
您应该查看Visual Studio TFS 分支指南 2010。 （直接下载）。在该包中，有一个 PowerPoint 演示文稿，可引导您了解一系列可能的分支结构。
听起来您想要“按项目分支”或“按开发人员分支”（因为每个项目只有一名开发人员，所以它们实际上是相同的）。
关于3路合并工具，看看这个列表就可以看到 如何配置您最喜欢的差异/合并工具。
You should take a look at the Visual Studio TFS Branching Guide 2010. (direct download). In that package, there is a PowerPoint deck that walks you through a series of possible branching structures.
It sounds like you want either "Branch by project" or "Branch by developer" (since you only have one developer per project, these are effectively the same).
Regarding the 3-way merge tool, take a look at this list to see how to configure your favorite diff/merge tools.