VS Team Explorer merge conflicts

git visual-studio merge team-explorer
xeraphim picture xeraphim · Nov 28, 2017 · Viewed 13.3k times · Source

When merging our develop branch into my feature branch develop --> feature in Visual Studio, I get a merge conflict.
I have the possibility to choose from Take Source and Keep Target.

I want to take the file from the develop branch. Which one is the correct option?

enter image description here

Answer

Edmund Dipple picture Edmund Dipple · Nov 28, 2017

In this case, you should Take Source. The "Source" is the develop branch and the "Target" is the feature branch.

Related questions

Visual Studio Code how to resolve merge conflicts with git?

I tried to merge my branch with another branch and there was a merge conflict. In Visual Studio Code (version 1.2.1) I resolved all of the issues, however when I try to commit it keeps giving me this message: You should …

Read More
Using Git with Visual Studio

As a long-time Visual SourceSafe user (and hater) I was discussing switching to SVN with a colleague; he suggested using Git instead. Since, apparently, it can be used as peer-to-peer without a central server (we are a 3-developer team). I …

Read More
.gitignore for Visual Studio Projects and Solutions

Which files should I include in .gitignore when using Git in conjunction with Visual Studio Solutions (.sln) and Projects?

Read More