Excluding files from merge

This is my first post here, so hopefully I'm doing it right.

We just converted from VSS to SVN last week and still have a lot to learn.
We have our main development at /trunk. We have our latest release at
/branches/wp332. Bug fixes are made to /branches/wp332 and merged into the
trunk and that works just fine. We have about 5 files that are both in
/trunk and /branches/wp332 that I want to keep separate copies. So, when I
do a merge from /branches/wp332 to /trunk, I don't want these 5 files
merged.

Is there a way to do this? If not, any suggestions on what to do?

Thanks,

Mike Suiter
 
Received on Mon Apr 4 17:41:58 2005