hello, I'm a new user of CVS and i

[yp56]

hello,
I'm a new user of CVS and i find it great :c)
But I have a problem.
I use cvs-1-11-4 with TortoiseCVS-1-2-2 on a win98 platform.

I use cvs since i have to continuous the work of someone. We are working together for 1 month and he still coding the application when i documented it.

SO I created my repository and put the project in with :
cvs init
cd theFolderOftheProject
cvs import myProject myName release_0_1

Then I check out the project into two another repositories (one for me and one for my friend)...

I documented one file during my friend still developpe the same file.

I commited my file. My problem become here. I don't know exactly how to merge the file i commited and the one of my friend ?

I try
cvs update myfile
The first time it runs and i have a file with the diff ligne
But after it only write :

cvs update myFile
M Myfile

Why it doesn't merge the two files ?
how can i do this ?

thanks a lot

(sorry for my poor english

 

[Queeny]

I'm a new user too so i'm not sure of the answer. but i think that when CVS is not able to merge the files automatically, you have to do manually...