[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

(no subject)

From: Alex Flores
Subject: (no subject)
Date: Thu, 14 Jun 2001 13:58:11 -0500

I need help please.  I can not merge a branch into my main trunk.  I am a ClearCase man.  I can not figure out how to use the CVS merge utility or how to resolve conflicts.  The only difference between the two files are some comments that I added.
D:\CVS\CVSwork\practice_folder>cvs update -j rel_1_0_practice practice_alex.cpp
M practice_alex.cpp
RCS file: d:/cvs/practice_folder/practice_alex.cpp,v
retrieving revision 1.5
retrieving revision
Merging differences between 1.5 and into practice_alex.cpp
rcsmerge: warning: conflicts during merge
D:\CVS\CVSwork\practice_folder>cvs update -j -j 1.9 practice_alex.cpp
C practice_alex.cpp
D:\CVS\CVSwork\practice_folder>cvs commit
cvs commit: Examining .
cvs [commit aborted]: end of file from server (consult above messages if any)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]