Category name:branch

Fixing a Branching Mess

At work we never really had a branching strategy. This resulted in a big branching mess. People were either not branching at all or were making it up as they went along.

Now we have chosen to follow guidance given at http://tfsbranchingguideiii.codeplex.com/. The Basic Branch Plan should work fine for us in most cases. This plan dictates that our branch hierarchy should look like this:

image

However, our branch hierarchy looked more like 2 separate trees or just a single column like this:

image

That’s not good.

I came across the option to reparent a branch from: http://social.msdn.microsoft.com/Forums/en/tfsversioncontrol/thread/70eb6d7d-ac81-4de0-a182-89993803b3de

However, when I tried this I saw that I could not select certain branches as a parent to other branches. The solution to this is the same as fixing branches after a migration. Do a baseless merge! This is nicely described in this post,  step 2:

http://www.richard-banks.org/2010/09/how-to-fix-branches-after-migration-to.html

 

And look at our branch hierarchy now:

image