×
INTELLIGENT WORK FORUMS
FOR COMPUTER PROFESSIONALS

Log In

Come Join Us!

Are you a
Computer / IT professional?
Join Tek-Tips Forums!
  • Talk With Other Members
  • Be Notified Of Responses
    To Your Posts
  • Keyword Search
  • One-Click Access To Your
    Favorite Forums
  • Automated Signatures
    On Your Posts
  • Best Of All, It's Free!
  • Students Click Here

*Tek-Tips's functionality depends on members receiving e-mail. By joining you are opting in to receive e-mail.

Posting Guidelines

Promoting, selling, recruiting, coursework and thesis posting is forbidden.

Students Click Here

Jobs

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

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

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

(OP)
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 ;)

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

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...

Red Flag This Post

Please let us know here why this post is inappropriate. Reasons such as off-topic, duplicates, flames, illegal, vulgar, or students posting their homework.

Red Flag Submitted

Thank you for helping keep Tek-Tips Forums free from inappropriate posts.
The Tek-Tips staff will check this out and take appropriate action.

Reply To This Thread

Posting in the Tek-Tips forums is a member-only feature.

Click Here to join Tek-Tips and talk with other members! Already a Member? Login

Close Box

Join Tek-Tips® Today!

Join your peers on the Internet's largest technical computer professional community.
It's easy to join and it's free.

Here's Why Members Love Tek-Tips Forums:

Register now while it's still free!

Already a member? Close this window and log in.

Join Us             Close