|Subject:||CVS Merge problem - will not merge in new code|
|Date:||Wed, 14 Feb 2001 10:42:36 -0800|
cvs co -r branch1 cvs server: file pin60/setup/scripts/service_um.pod exists, but has been added in revision production
cvs update -j production -Pd cvs server: file pin60/setup/scripts/service_um.pod
cvs server: file pin60/setup/scripts/service_um.pod exists, but has been added in revision production
This will occur on trying to merge in the changes from another branch as well.
The file was created between the creation of branch1 and statictag.
What happen's is that any changes that I want bring in will not update the code on the branch.
Description: Card for John Mocyk
|[Prev in Thread]||Current Thread||[Next in Thread]|