I have VS2012 with Update 2 installed. I've installed Visual Studio Tools for Git. Now I want o fetch changes from the remote repository, but they are in conflict with my local changes? How can I perform merge and/or edit conflicts?
In Visual Studio go to
Change the plug-in to "Microsoft Git Provider", and then hit Ok. The solution window should now show you options to enter your default Git Settings.
NB - As per this Visual Studio post, Visual Studio 2013 includes Git tools by default, so this will not be needed.