How to merge from branches to trunk by TortoiseSVN
1, Select the revision that you want merge to the trunk
a, show revisions
b,select the revision that you want to merge
2,select the trunk as destination
3,commit in trunk code base to put in to effect