Branch merging into main line,

[David Petruescu]

All,

I have a dilemma. I am fairly new to CVS. One of my developers needs to
merge a branch into main line. There are a lot of files that need to be
manually merged. My take on this is that he needs to edit the main line file
by adding to it the "extra stuff" contained in the branch file. Then just
check in the main file into CVS just like any other check in. Am I right?

I would really appreciate any help I can get with this issue.

Thanks

David Petruescu


************************************************************************
This e-mail and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed.  If you have received this e-mail in error please
notify the system administrator - address@hidden

Any views or opinions expressed in this e-mail are those of the 
sender and do not necessarily coincide with those of Wireless, Inc.

This footnote confirms that this e-mail message has been scanned
by a virus protection program for the presence of a computer virus.
************************************************************************