How to I tell VisualSVN to do a replace instead of a merge?

We're finding ourselves unable to open our project in Visual Studio because SVN is adding lines like

"<<<<<<< .mine"

to our .csproj files.

This is apparently something SVN inserts when it has trouble merging files, but we're not interested in merging things as two people can never have the same file checked ou开发者_运维问答t.

How do we set Visual SVN to Replace instead of Merge?

Thanks for any help.

It's doing that because SVN tries to preserve whatever changes you've made to your local working copy. Thats a pretty important aspect to the SVN method of version control so I don't know, and doubt, if its possible to do that. I do know you can tell svn to ignore files, but their changes then won't be committed to the repository, nor updated from the repository.

If its a problem, delete the csproj file, then when you update it will redownload the proper version. Do that whenever theres a problem. If it happens quite a bit, then one of the developers is messing with the file.

Past projects I've worked on had a dozen engineers working on the same projects, and we never had constant merge problems with the .csproj files.

What do you mean by "two people can never have the same file checked out"? I think you are misunderstanding how Subversion works - checkout is not an exclusive lock on a file.

Visual SVN uses Tortoise on the backend I believe. when you are in a conflicted situation (i.e. SVN cannot merge the two versions cleanly) you should have the option you should get a pop up where you have the option to either "Use Local" or "Use Repository". If you choose "Resolve Later" you'll get what you are describing.