Kaz Kylheku wrote: > CVS doesn't require hand merging. When you perform a cvs update > operation, then new changes in the repository are automatically > incorporated into your working copy. Only when a conflict arises do > you have to do resolution by hand. Conflicts tend to occur rarely, and > are usually very easy to resolve.
Conflicts are extremely easy to produce and may not be easily resolved. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
