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

If you're using a shell client like TortoiseSVN, then right click "resolve using mine" as @Adi mentions.

On the command line, it's

svn resolve --accept mine-full