When merging branch to trunk follow these steps:
- Commit all branch changes to svn
- Checkout trunk to workspace
- Right-click on trunk project in workspace: Team -> Merge
- In from url select branch to be merged to trunk
- In to url check 'Use "From:" URL'
- In from revision choose last revision to get from branch. Think about it, you want revision that has all the changes that were done since last merge to trunk
- Click Merge
- If there are any conflicts, they will show up in project file tree, resolve them by: Team -> Edit Conflicts... on the file in question.
- Once conflicts are resolved, Team -> Marked Resolved... on the file.
- After all conflicts are resolved, and everything works, commit!
