...
1. Check out the trunk.
svn checkout svn+ssh://svn.mit.edu/zest/thalia/laszloui/thaliatrunk
2. Find out when the branch was created.
svn log --verbose --stop-on-copy svn+ssh://svn.mit.edu/zest/thalia-/ui/branches/thalia-UI1.0-sprint1/sprint4 | grep '^r' | tail -n 1
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-/ui/branches/thalia-UI1.0-sprint1/sprint4
4. Inspect merged files and resolve conflicts.
...