Tuesday, 15 June 2010

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



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

when latest in vs (2010 or 2013), if there conflicts, there nil displayed me create obvious. invariably think ok, build, , build works.

the onus on me remember conflicts, open conflicts window. there way create vs in face, , tell me there conflict?

you can re open resolve conflicts window if closed error team explorer. goto: pending changes, actions drop down, select resolve conflicts.

from there can click conflicts.

normally vs prompt resolve conflicts 1 of following:

get latest check in merge

visual-studio-2010 tfs visual-studio-2013

No comments:

Post a Comment