Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

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?

Many thanks!

share|improve this question
    
assuming the VS tools for GIT are well integrated, you should find the conflicts in View -> Other Windows -> Pending Changes, and select the "conflicts" button on the left side of the window. from there you should be able to automerge, merge in MS merge tool, Keep target, or Take Source. –  Frank Thomas May 29 '13 at 16:32
    
@Frank, I've tried your solution but Im only getting this error: "Team Foundation Server is not the current Source Control plug-in. Change Plug-in" –  user969153 May 30 '13 at 14:27
    
sounds like they are not integrating the tools very well then. you will have to seek documentation from the publisher of the plugin. visualstudiogallery.msdn.microsoft.com/… –  Frank Thomas May 30 '13 at 14:55

1 Answer 1

In Visual Studio go to

Tools > Options > Source Control

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.

share|improve this answer

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.