At work I’m looking on how we should work with TFS so today I listened to .NET Rocks episode 918, Digging deep on TFS with Martin Woodward.

This is a great discussion covering a lot when it comes to TFS but also source control in general. The guys also talks about Git, CodePlex and Git support on Visual Studio.

Source control is not easy, at least I think so. Should you branch or not? How often should you branch and merge? What do you do with unfinished code when merging? The questions are many and I’m trying to sort them out.