Merging a Branch to the Trunk

[Sharon Strait]

We are trying to work on two different builds (one on a branch and one 
on the trunk).  We need to keep certain directories in the trunk, but 
not in the branch.  How can we merge the branch and keep it from 
deleting specific directories in the trunk?  Some of the files are binary.

address@hidden