...
To merge a branch back to the trunk:
1. Check out the trunk.
svn checkout svn+ssh://svn.mit.edu/zest/thalia/laszlo/thalia
2. Find out when the branch was created.
svn log --verbose --stop-on-copy svn+ssh://svn.mit.edu/zest/thalia-branches/thalia-UI1.0-sprint1/
3. Merge branch changes into local copy of trunk (foo == last rev listed by the above svn log).
{{cd working/copy/of/trunk
svn merge -r foo:HEAD svn+ssh://svn.mit.edu/zest/thalia-branches/thalia-UI1.0-sprint1/}}
4. Inspect merged files and resolve conflicts.
5. Commit changes to trunk, noting in the log message the range of revisions merged.
svn commit -m "Merged sprint 1 branch r123 - 456 into trunk."
Note: If a branch was merged with the trunk at some point in the past, foo above is the rev of the last merge. Do a find for "Merged" instead of looking at the end of the log.
...