Git

About three years ago, our team migrated from using Subversion to Mercurial, primarily because of the pain involved with branches. If you've heard the phrase "tree conflict," then you know what we were dealing with.

If you're like most .NET developers, chances are quite high that you're developing on Windows. In case you're unaware, git was originally written to manage the Linux source code. What this means is that it has a very different philosophy than your standard Windows application.