Using the CVS Client185
If you are familiar with the UNIX
diff
command, you will recognize the output of this
command. See Section 7.3 for more information on the output of the
diff
command.
As you can see, CVS checked the repository for the latest copy of the file and compared it
with the one in the working directory. This output indicates that one line has been changed at
line 134 (a formatting change to the print statement).
6.4.6Resolving Conflicts
The
update
option will merge two conflicting files into one file and insert special mark-
ers into the file that help you determine where the differences are and resolve them.
# cvs update test.dat
RCS file: /usr/local/cvsroot/fuzion/test.dat,v
retrieving revision 1.4
retrieving revision 1.5
Merging differences between 1.4 and 1.5 into test.dat
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in test.dat
C test.dat
The resulting
test.dat
file is shown below, clipped for brevity;
# cat test.dat
aerosol
aerosolize
aerosols
aerospace
aesthetic
aesthetically
aesthetics
<<<<<<< test.dat
zebras
zenith
=======
zebras
zenith
zoological
zoologically
zoom
zooms
zoos
>>>>>>> 1.5
The
<<<<<<<
and
>>>>>>>
markers indicate which version of the file has had which
edits made to it. The text between “
<<<<<<< test.dat
” and “
=======
” indicate text that
was added from the time that the file was checked out until the time when the merge was done.
The text between the “
=======
” marker and the “
>>>>>>> 1.5
” exists in version 1.5
of the file (in the repository) but not in the local working copy.