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 are working in the command line instead of using a UI, svn will ask you when you do "svn update" something like:

Conflict discovered in 'bar.c': (p) Postpone (e) Edit (tf) Theirs-full (mf) Mine-full

What you want is mine-full (mf). Of course this will overwrite any changes that the other person made, so you may instead want to (e)dit.

If you choose to (p)ostpone this, you will need to change the file later and mark it as resolved (svn resolved ), followed by a svn commit.