Re: CVS update command
"Gabriel Genellina" <[email protected]>
| Newsgroups | gmane.comp.version-control.cvs.windows-nt.user |
|---|---|
| Message-ID | <[email protected]> |
En Mon, 23 Mar 2009 03:08:54 -0300, Sanjeev, Neeraja (GE Infra, Energy) <[email protected]> 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 _______________________________________________ cvsnt mailing list [email protected] http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt Upgrade to CVS Suite for more features and support: http://march-hare.com/cvsnt/