Learn how to resolve Merge Conflicts in Git using this guide. Merge Conflicts can occur if the same parts of code are changed in different branches.

It's not a version control free-for-all: You have to choose which VCS you're going to use, though it's set up on a project-by-project basis. As Visual Studio ALM MVP Esteban Garcia explained on the ...

Resources for using the popular distributed source code control and collaboration tools Git and Mercurial on Windows.

GitSync for Plastic SCM has been released with support for native Git network protocols and Visual Studio 2012 support.