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

Just for anyone who has many conflicts and doesn't want to resolve them one by one, keeping yours changes, just run this:

svn resolve . -R --accept mine-full

Related SO question