Merge two branches using tortoise SVN

Question

I have a branch which I am doing the changes seperately. Other team mates doing the changes in trunk. Scenario is, now I want to give a release including trunk updates + my

Answer 1

Perform fresh checkout of your repository 
Precondition:( Suppose your repository name: Team )
1. You have trunk( Main Dev )
2. You have branch ( Your changes )
3. Create say "newbranch" from trunk.[ TortoiseSVN->Branch/tag][ Picture1 }Note:Select Head revision

4. Perform svn Update inside "Team"->So newBranch is updated.[picture2]

5. Now, select newbranch and merge[Tortoisesvn->Merge][Picture3]

6. Select default "Merge a range of revision", to select revisions which you only intrested to merge.[[Picture4]

7. Click, showlog to select required revisions you intrested on[picture5]

 Finaly merge is completed[picture6]

**Note: If Conflicts comes across, then merge conflict revisions manually.

Answer 2

I would create a new branch from trunk and than merge your branch in the new branch via Merge a range of revisions. Because the new branch is newer all should work fine.