TFS Merge issues - "The files are identical" - Derek Adkins

TFS Merge issues - "The files are identical"

I hope someone has the solution to this problem we're having:

When we run a baseless merge in TFS from the command line between 2 branches, we get roughly 3000 odd conflicts that the system refuses to resolve.  Yet when we right click and select "compare - source to target" we get the dialog "The files are identical".  This happens with most of the files in the resolve conflicts list that TFS can't seem to resolve.

Are we doing something wrong?  Is there some setting in TFS that we can alter to correct this seemingly dumb behavior?

Share this post: email it! | bookmark it! | digg it! | reddit! | kick it! | live it!
Published 18 July 2007 12:55 PM by derek

Comments

# ahmeds said on 25 July, 2007 10:56 AM

Derek,

See forums.microsoft.com/.../ShowPost.aspx and also forums.microsoft.com/.../ShowPost.aspx

basically it boils down to the fact that TFS does not compare files when doing a merge. In a normal merge scenario a copy is made when you make changes hence you know when there is a conflict. In this case there is no relationship. Basically you can use tf resolve /auto:acceptmerge to make things easier. Based on my research it looks like there was some problem where it would hang. See forums.microsoft.com/.../ShowPost.aspx

Hope this helps

# branchs said on 21 April, 2008 06:30 AM

Pingback from  branchs

Leave a Comment

(required) 
(required) 
(optional)
(required) 

Enter the numbers above: