cvs merge a file not done in CVS
 

Hi,

In a CVS repository there is a file core.h that was updated and everything was fine. The CVS repository was used by everyone unfortunately and one person made updates to a really old version of core.h (Without using CVS). And now we can't merge the 2 together it seems the entire files takeover rather than keeping old functions; and injecting the new functions.

Thank you

roll-back to the previous version, get the modified function out of
the colleagues copy, manually diff it into a new copy after the roll-
back, and resubmit.



Cheers,
Tink