I am trying to merge one project into another using TFS' MSSCCI Provider in XP Mode. These are "legacy" (in the sense that a Pterodactyl is a legacy avian) projects built and maintained in Visual Studio 2003.
I get a few conflicts about the local file being writable, but based on what I could glean from a bing search, I can just go ahead with the overwriting in most cases.
However, I have a special case: a file that, based on its name, is a TFS "housekeeping" file, namely mssccprj.scc:
I don't want to hose up my TFS connections and so am wary of overwriting this file. Should I or not? And if not, what is my option for saying, "never mind, this isn't really a conflict"? It seems as if I either "resolve the conflict" or the merge will fail.
UPDATE
I have the same issue/question with a file named "vssver.scc"