Antonio Gallardo wrote:
It is.Hi Steve:Sorry, but I dont understand the point. :-( Vadim told me that: "Conflict. Rename your .cvsignore, checkout, then you can merge." Then I saw the file there in the cvs site. I dont understand if this is correct or not.
You modified your local .cvsignore file, and CVS wasn't able to automagically merge with an updated version of .cvsignore from the repository.
So Vadim suggested to rename your local copy so that it isn't in the way anymore, 'cvs update' so that you get the repository version of the file, and then you can manually merge the differences between both. There even exist conflict editors for such a purpose: http://sourceforge.net/projects/conflicteditor
HTH,
</Steven>
--
Steven Noels http://outerthought.org/
Outerthought - Open Source, Java & XML Competence Support Center
Read my weblog at http://blogs.cocoondev.org/stevenn/
stevenn at outerthought.org stevenn at apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
