Geek Answers Handbook

Transition to branching with TFS

Our team currently uses the plain old TFS 2005, has no branches, general checks, etc ... I would like to introduce the DEV / MAIN / PROD branch system, similar to the main flavor in the TFS Guidance document , so that we can do some parallel development, isolate and simplify review and deployment processes.

I have read most of the white papers etc. Do you have any practical advice, tools offered, gotchas or recommendations. In addition, we plan to move on to 2010 as soon as it comes out - I'm not sure if it will affect anything. I appreciate all the suggestions and help I can get, as I am a branching neophyte.

+6
version-control branch tfs
source share
1 answer

My recommendation would be to keep your branching strategies simple. It's easy to get carried away and implement fairly complex branching strategies that require the entire team to simply manage them.

I tend to go only with a "main branch" and one (or many) "release branches". The main branch is where everyday development takes place, and the release branch is used to take a snapshot of the code before it gets pushed to production.

The main branch continues to change as the project develops over time, while the release branch is a way to return to make changes to what is in production without risking, including other ongoing changes in the main branch. Unlock is used to create fixes.

I described this in more detail on my blog:

http://hectorcorrea.com/Blog/Simple-Branching-Strategies-for-Team-Foundation-Server

+4
source share

More articles:


All Articles