SVN Command to Merge Branch to Trunk

SVN Command to Merge Branch to Trunk
How to deal with this message:
local missing, incoming edit upon merge

Solution:
Just copy the missing file to the working directory.

Some commands which are needed.
>svn commit -m "message"
commit the changes with message.

>svn update
or
>svn up
update the latest codes from SVN branch/truck to local machine.

>svn resolved /path/file
resolved the conflicts

>svn log -v -r 46711
watch the change file list in revision id 46711.

>svn merge -r startRevision:endRevision http://branchSVN/path/directory targetDirectory
command to merge the revision.

>svn revert path/file
revert the local changes

refereces:
http://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts