How to get Visual Studio to open Resolve Conflicts window after a TFS Get

visual-studio tfs version-control merge-conflict-resolution
valerie picture valerie · Jun 22, 2014 · Viewed 50.3k times · Source

When I do a Get Latest in Visual Studio, if there are conflicts, there is nothing that is displayed to me to make it obvious. Invariably I think everything is OK, do a build, and often the build works.

The onus is always on me to remember to look for conflicts, to open the Conflicts window. Is there any way to make VS get in my face, and tell me that there is now a conflict?

Answer

DaveShaw picture DaveShaw · Jun 22, 2014

You can re open the Resolve Conflicts window if you closed it by mistake from Team Explorer. Goto: Pending Changes, then from the Actions drop down, select Resolve Conflicts.

From there you can click Get All Conflicts.

Normally VS will prompt you to resolve any conflicts as soon as you do one of the following:

  • Get latest
  • Check in
  • Merge

Related questions

Visual Studio isn't tracking changes, or checking out files from source control as I edit them

I am new to TFS. At my job I mapped the TFS projects to local directories, performed a get, and everything works as I expected. When I edit files on my local copy, source control automatically checks them out for …

Read More
Warning displayed when adding solution to Team Foundation Server 2010

I'm just getting to grips with TFS 2010 (never had any luck with TFS 2008) and I'm trying to add my first solution into TFS. However I am getting the following warning message: The project that you are attempting to add to …

Read More
What is the difference between "Compare with Workspace version" and "Compare with Latest version"?

I am using Visual Studio 2012 with TFS. Whenever I want to compare my checked out files, I have two options to choose from: Compare with workspace version Compare with latest version What is the difference ?

Read More