-
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?