probleme incvs branch merging working

[anup nanda]

Dear Cvs users

I have a problem getting cvs branch merging working
I have a main branch for our website content, and a 
development branch for our test environment.  How do I

merge the new content in the main branch (stuff in
after 
code freeze lifted) and a few bug fixes from the dev 
branch? I have tried various commands, but cant seem
to get 
this set up right.
Thanks in advanse
Jeson



__________________________________________________
Do You Yahoo!?
Get email at your own domain with Yahoo! Mail. 
http://personal.mail.yahoo.com/?.refer=text