Problem with checking in file in Visual Studio 2008

[egarrison]

Whenever I make a change to a file through Visual Studio and try to check it back in, I get the following error from Vault: Item $/filepath caused the transaction to fail: You must merge your working copy with the newest version before Check In can succeed.

I do have the latest version and no one else has this file checked out. I have deleted the shadow files that can sometimes cause problems with Vault. I also unbound my project from Vault and rebound it and it did nothing. I am only getting this error with one file so I don't think it is a problem with project.

[Beth]

You will want to open your Vault GUI client and perform a show merge on the file. What the Needs Merge indicates is that the baseline that you were working from wasn't the current version. Once you have the merge resolved, you will be able to check it in. You may find it better to close your project in Visual Studio while you are merging.

Another possible away around this is to perform a Get with the Automatic Merge options. If Vault is able to merge it, then it will take care of that. If it can't, then there's a conflict and you will need to perform the manual merge I mentioned in the first paragraph.