cvs added independently by second pary -


i have question regard cvs. when add 2 files cvs using add function of tortoise cvs. following error messages appear:

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

are there elegant way of solving problem? thanks.

you have conflict local , repository. easiest way i'm aware of copying local elsewhere , checking out latest version repository. modify new checked out files local files want commit.


Comments