Re: Merge Confusion

[Sergei Organov]

"Jim.Hyslop" <address@hidden> writes:
> work wrote:
[...]
> > At this point, I'm not overly concerned about deleted or added files
> > (to me they are much easier to deal with since the entire file is
> > involved).
> You will have to use 'cvs add' and 'cvs remove' to have these files added or
> removed from the trunk.

I don't think he will. At least for me it works automatically. I mean
all the files are already added/removed after the merging command has
been executed, so I only need to commit (after resolving conflicts, if
any).

-- 
Sergei.