[cvsnt] CVS update command

Gabriel Genellina gagsl-cvsnt at yahoo.com.ar
Mon Mar 23 18:20:08 GMT 2009

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.

En Mon, 23 Mar 2009 03:08:54 -0300, Sanjeev, Neeraja (GE Infra, Energy)
<neeraja.sanjeev at ge.com> escribió:

> I mean "update -j" merges the two versions of files. In this process, I
> saw CVS adds some extra comments into the file While merging.

Things like this?

<<<<<<<< demo1.txt
Current text in the file.
Previous text in CVS.
>>>>>>>> 1.3

This is a conflict: a change both in YOUR sources AND the version in CVS.
Conflicts are marked with a C letter when you update the sandbox. You must
solve the conflict manually and commit the changes. Look for "conflict" in
the CVSNT manual.

Gabriel Genellina

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook