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

Right click the conflicting file and choose "use mine". FYI, the other alternative is "use theirs". Of course this requires UI.