If you created a branch and want to merge your branch changes into trunk, here’s what to do:
svn merge trunk_path@head branch_path@head .
If you created a branch and want to merge your branch changes into trunk, here’s what to do:
svn merge trunk_path@head branch_path@head .