|
I am trying to get a specific version of a file by label. After I key in the lable and select OK, TFS starts the "flying files" dialog (a.k.a. "coffee time dialog") telling me it is getting a list of files to update.
Eventually I get a "Reslove conflicts" dialog telling me the local file on my machine is writable and I need to resolve the conflict. So I click the "Resolve" button and a "Resolve writable file conflict" dialog appears.
At this point, I only have two options. "Overwrite the local file/folder" and "Ignore conflict".
There is a "Compare" dropdown on the dialog but the dang thing is always disabled. It sure would be nice to be able to compare the file in TFS to the file in my mapped folder before I am forced to overwrite the file on disk. I don't want to just overwrite the file without more information on just what I may be losing. Clicking "ignore conflict" is useless too since it doesn't "get" the file and that means that I cannot even go back to the stating point and choose the "Compare" menu entry that shows up when I right-click on the item in the tree view (it is disabled until I do some kind of "get").
So why is the "Compare" capability disabled on this resolve conflict dialog?
Or: Why can't I just compare the file on disk to that in TFS to start with without having to "get" the file first? And yes I can live with comparing to the latest version. It is better than not being able to compare at all. Really it is.
I am having to resort to copying my file, resolving by overwrite and then doing my own windiff to see what if any issues exist. |