[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.
Thannks,
Alex
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 1.5.2.2
Merging differences between 1.5 and
1.5.2.2 into practice_alex.cpp
rcsmerge: warning: conflicts during
merge
D:\CVS\CVSwork\practice_folder>cvs update -j
1.5.2.2 -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)
D:\CVS\CVSwork\practice_folder>
- (no subject), carl, 2001/06/10
- (no subject), rabbitxu, 2001/06/12
- (no subject), rabbitxu, 2001/06/12
- (no subject), rabbitxu, 2001/06/12
- (no subject),
Alex Flores <=
- (no subject), Amitabh Trivedy, 2001/06/18
- (no subject), Randall Weigers, 2001/06/18
- RE: (no subject), Thornley, David, 2001/06/18
- (no subject), Thomas Broadbent, 2001/06/19
- (no subject), feedback, 2001/06/21
- (no subject), Srinivas S, 2001/06/22