CODEWITHSUNDEEP
tfsvisual-studio-2012
SDK
SDK

Reputation: 830

Any way to just view conflicts in Visual Studio 2012

Is it possible to just view conflicts in Visual Studio 2012, without merging or checking in. In 2012 you used to be able to Get Latest Version then go to the pending view and click the show conflicts icon.

I'm keen know if you can do this without any add-ons / external commands, i.e. just using what Visual Studio 2012 standard installation has, without for example either of the following:

Team pilgrim: http://visualstudiogallery.msdn.microsoft.com/79e9baa7-ea8b-4335-86ba-ae929bf67222

Or: tf checkin

Upvotes: 11

Views: 10108

Answers (2)

Andrew Clear
Andrew Clear

Reputation: 8020

Use the "Compare To" option in the right click menu. You can choose to generate a diff between any two versions.

Alternatively, you can do basically the same option with 2012. You can get latest, which will throw any conflicts that exist between the local version and the server version. Conflicts can then be resolved locally, and then either discarded or checked in.

To remove automatic conflict resolution:

`Ctrl+Q --> "Conflict" --> ENTER --> Uncheck "Attempt to automatically resolve conflicts when they are generated"

Upvotes: 7

urk_forever
urk_forever

Reputation: 873

I was just searching for an answer to this myself, when I found out how you can do this. Here is how to can just view conflicts.

Go to the Team Explorer and select Pending changes. In the Pending changes window there is a dropdown menu named Actions, click that menu and in the menu is an option Resolve conflicts. Click that option and a window will be opened showing all conflicts in the workspace similar to the resolve conflicts window of VS2010.

Hope it helps.

Upvotes: 47

Related Questions