[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
When trying to merge a file
From: |
Horia Ioanid |
Subject: |
When trying to merge a file |
Date: |
Fri, 23 Mar 2001 10:42:17 -0500 |
I have cvs 1.11.
When trying to merge a file from a branch to the main trunk,
being on the main trun working directory and typing
cvs up -j VCR_BRANCH pnt.h
I get this:
cvs server: file pnt.h exists, but has been added in revision
VCR_BRANCH.
Does that mean that the file was merged, or what?
Thanks for help
--
Horia Ioanid
Niksun, Inc. http://www.niksun.com
111 North Center Drive, North Brunswick, NJ 08902-4909, USA
(732)821-5000/227
- When trying to merge a file,
Horia Ioanid <=