Tips and Tricks in a world of Mix

Trying to get specific with both checkboxes V-ed didn’t get the Resolve Conflicts windows ,

only some pale message in the Output Windows saying – “ you have a pending edit ”

Goggled it up –>

http://social.msdn.microsoft.com/Forums/en-US/tfsversioncontrol/thread/850d9415-4a41-454f-89a5-cb5fe534dbd2

Found the cache and deleted it . Didn’t solve anything.

Talked to a wise man at the place of work.

By his words only when Check In performed the Resolve Conflicts appears for merge , if you are in a check out mode by the file the merge won’t be performed .

Is it so ? Did you try to get latest with checked out file and got “ you have a pending edit  “ ?

How can I get somebody else’s changes when I am in the middle ?

 

My solution was to shelve the pending checkouts and I will return it after the “Get Specific Version”.  What would you do ?

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

Tag Cloud

%d bloggers like this: