Search code examples
cvs

cvs added independently by second pary


I have a question with regard to cvs. When I add two files to CVS using add function of Tortoise CVS. The following error messages appear:

cvs add: ' **.cpp' added independently by second party. 

Are there elegant way of solving this problem? Thanks.


Solution

  • You have a conflict with the local and repository. The easiest way I'm aware of is copying your local elsewhere and checking out the latest version from the repository. Then modify the new checked out files with the local files you want to commit.