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

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

Leave a Comment