1Ĭmd = "c:\program files (x86)\microsoft visual studio 11.0\common7\ide\vsdiffmerge.exe" "$local" "$remote" //tĬmd = "c:\program files (x86)\microsoft visual studio 11.0\common7\ide\vsdiffmerge.exe" "$remote" "$local" "$base" "$merged" //m git folder and edit config file adding this piece of configuration. if you prefer using visual studio you should configure vs as diff and merge tools and you can choose to configure this at repository level or at global level. Since i’ve configured kdiff3 as standard conflict resolution tool after i installed msysgit, visual studio honors this settings and opens kdiff3 to do the diff, even if i’m inside the ide of vs. to verify actual settings you can open a git bash on the repository, issue a git config –list command and look at merge.tool and diff.tool settingsįigure 4: actual configuration for merge and diff tools This happens because visual studio git plugin uses standard git configuration, your local repository probably does not have any specific tools for diff and merge (unless you configured them), so global settings are honored. įigure 3: file compare is done with kdiff3 instead of visualizing them inside visual studio If you press “compare files” to visualize diff of files, it could happen that kdiff3 is opened to visualize the difference, instead of resolving directly inside visual studio. Now you should resolve all conflicts before being able to continue work: you can click on file name that is conflicting and you are presented with a ui different from the one you are used with standard tfs source control.įigure 2: ui to manage conflicts when you are using git in visual studio Suppose you are working with visual studio, you issue a pull and find that there is some conflicts in repository. the most obvious one is that commits are done using the wrong user.name and user.email configuration as i’ve described in visual studio tools for git, a primer, other one can be: tools used to do merge and diff during conflicts. If you are using visual studio plugin for git, but you have also configured git with msys git, probably you could be surprised by some visual studio behavior.
0 kommentar(er)
