Vault tries to merge even when told to overwrite

[vrapp]

I have an old version of a file, component of VS2003 project. The version of the file in the repository is newer than I have. The version in the repository was last modified today, while my working version was modified in September. I want the new version.

I open the project in VS2003; I see dialog "Get" and press OK. The next dialog says: "file may have been modified". I choose "overwrite".

Next moment, I see error message: "the Get Latest Version operation failed. Automatic Merge Failed. In output window: "Could not automatically merge C:\..... due to conflicts"

Why merge? I told it to overwrite!

It's Vault 3.01.

[lbauer]

What option is set for how to handle modified files in VS.Net 2003->Tools -> Options->Source Code Control?

[vrapp]

the screenshot is attached.

[lbauer]

I'm not in the office and don't have VS.NET in front of me, but I thnk if you click on SCC there should be an Advanced button with more options.

[vrapp]

Yes, there is. I think you have in mind Local Files/Modified working copy. It has value "attempt automatic merge" , then two checked options "prompt before overwriting locally modified files" and "save files in backup folder before overwriting".

In any case, I think if it showed me the prompt with threee choices, and I choose "overwrite" rather than "merge", shouldn't it take precedence over whatever option is in settings? The way it works, I couldn't get the new copy at all - it did not want to overwrite, but failed to merge. I did it in the standalone Vault Client. I think it's not right. What's the point of asking what to do if it is going to merge anyway?

[lbauer]

That's true, there could be a bug. We'll take a look at it after the holiday weekend.

[pogaz]

Was this ever resolved? If so, I need the solution to this issue.

Thanks.

[lbauer]

Are you having the same problem?

What version of Vault are you using? What version of Visual Studio? Are you using the Enhanced or Classic Client for integration?