One question.
Assume that I want to merge the main branch s2_5 to icap-2_5 branch
If I am  right, I must execute the followings:

     cvsmergeinit s2_5
     cvsmerge  s2_5

Make my changes and then execute:
cvs commit


As I show the cvsmergeinit makes a tag to CVS  e.g Z-icap-2_5_merge_s2_5
What if the tag already exists in CVS?
Must I simply deleted before cvsmergeinit?

Am I loosing something?

Thanks,
  Christos

Reply via email to