I currently have a project that's not part of Source Control explicitly (I didn’t add it through the Visual Studio IDE), but I've imported the files manually. The working folder resides on a network share, some of the files have been edited since they were imported, and I'd now like to merge those changes back into the project in Vault.
The problem is that I can't figure out how to do it. I can view a Diff on the files, and Vault tells me that some of the files have changed. However, since Vault shows the local copy as "missing", is it possible that it doesn't know that the "local" copy is there?
I actually got the files into Vault by importing them into a new project, and then I specified the folder I imported from as my working folder for that project. However, since I never actually did a "Get Latest Version" on the project into my Working Folder, is it possible that Vault doesn't know that a local copy even exists?
Update repository with "local" files
Moderator: SourceGear
If you set the working folder to the location of the files, the file status should be Unknown, and then when you do a Get Latest, it should try to resolve the contents of the files (if the file matches one in Vault, it will determine which version it is, but if it has been edited, it will report that the file needs merged).
If the file is reported as missing, either the working folder is not where you think it is (check above the file list in Vault for the working folder location), or the file is actually missing from the working folder.
If the file is reported as missing, either the working folder is not where you think it is (check above the file list in Vault for the working folder location), or the file is actually missing from the working folder.