Resolving SourceTree Merge Conflicts with Visual Studio

I’m currently working with a company where Git is the source control repository of choice and SourceTree is the tool to handle the interactions with the repository.

Until now I’ve been a Team Foundation Server guy, and before that a Subversion guy, and before that a Visual Source Safe guy so I’ve always (with the exception of Source Safe) enjoyed working with those repositories via Visual Studio.  Personally I really like the merge Window in Visual Studio.  I know it and I’m comfortable with it so I like to use it. Continue reading