Handling SVN conflict

Question

When firing the SVN update statement I am getting the conflicts. How can I keep my version and check that in. What is the command for that?

Answer 1

Your problem is that both of you have edited the same part of a file. As soon as you did that, there was going to be trouble down the line. SVN's doesn't do file level locking (for good reason!), so assumes that you won't both make changes within a few lines of each other.

If you happen to be using Visual Studio, I've been working on a tool that will highlight parts of the file you are editing that have been changed by someone else.