[cvsnt] Merging branches.

[James Neave]

Hi,

Complete CVS novice here.
I have a patches branch (V1_1_patches) and the main development branch
(working towards V1_2)
I recently merged the changes made to V1_1 ready for the release of
V1_2, but some of them appear to have gone missing.
Specifically, it seems to be the last changes I made to the branch.
I used WinCVS to do the update/merging.

What command should I use to guarantee that all the changes from V1_1
make it to the dev branch?

Thanks,

James.

The information in this email is confidential and may be legally privileged.  It is intended solely for the addressee.  Access to this email by anyone else is unauthorised.

If you are not the intended recipient, any disclosure, copying, distribution or any action taken or omitted to be taken in reliance on it is prohibited and may be unlawful.

The contents of an attachment to this email may contain software viruses that could damage your own computer systems.  Whilst The Spur Group of Companies has taken every precaution to minimise the risk, we cannot accept liability for any damage that you sustain as a result of software viruses.