I am using Visual Studio 2015 Pro and working with the Git repository. Let's say I made an attraction or applied hidden changes or did something that made my branch come into conflict. For example, in this case, I just applied stash:
As you can see, I have a bunch of changes, but Web.config is in conflict. Why are there always conflicts in XML files?
Now I go to Visual Studio and go to Team Explorer-> Changes:
Here I see my phased changes, but there are zero unstated changes. I am wondering why Web.config is not showing up here, so I can resolve conflicts.
Two things:
- I believe that if I did Pull using Visual Studio, it would detect conflicts that then trigger the merge tool. I have not tried this yet, but I know that this works for TFS. However, I would like to know if I can use Git pull from the command line and then use Visual Studio to resolve conflicts.
git config --global merge.tool already vsdiffmerge , so if I have to run git mergetool from the command line, it will use Visual Studio to merge. However, this creates a new instance of Visual Studio, which is slow and annoying and does not allow me to work in the context of the rest of my project.
Does anyone have an understanding of this? Thanks!
git visual-studio visual-studio-2015
Mike christensen
source share