SVN how to resolve new tree conflicts when file is added on two branches

Question

When merging a couple of branches (using SVN 1.6.1) where a file has been added on both branches (and then worked on in those separate branches) I\'m getting one of the new

Answer 1

What if the incoming changes are the ones you want? I'm unable to run svn resolve --accept theirs-full

svn resolve --accept base