[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Merge Confusion
From: |
Jim.Hyslop |
Subject: |
RE: Merge Confusion |
Date: |
Wed, 30 Jun 2004 11:16:24 -0400 |
Sergei Organov wrote:
> "Jim.Hyslop" <address@hidden> writes:
> > 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).
Good thing you and Larry are here to keep me honest ;-)
Sorry about the misinformation, Rick.
--
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)