svn merge from trunk to branch conflict for a file deleted in the trunk

Question

After a subversion merge from trunk to branch, I got a conflict because a file has been deleted in the trunk and modified in the branch. I would like to keep the trunk choice, but using "svn resolve --accept theirs-full" from the branch directory tells me

svn: warning: Tree conflicts can only be resolved to 'working' state; '/path/to/file' not resolved

What should I do to have the file correctly deleted in the branch ?

Answer 1

Since you know what you want to achieve, you may resolve the conflict in any way svn accepts (seems that svn wants you to keep the file) and then remove the file by hand if it survives.