On Fri, Nov 22, 2002 at 12:23:56 -0500, MacMunn, Robert sent 0.9K bytes: > Thanks. Looks like merges must be difficult in CVS. A lot of manual work.
Most of the time, merges happen automatically. Manual intervention is only required when they can't happen automatically. Conflicts always take (some amount) of a manual work. Merges never do. I don't see how you can get around this fact in any system, short of exclusivity. Looks like you may be confused by terminology. RTFM. HTH Scott > > -----Original Message----- > From: Kaz Kylheku [mailto:[EMAIL PROTECTED]] > Sent: Friday, November 22, 2002 12:18 PM > To: MacMunn, Robert > Cc: [EMAIL PROTECTED] > Subject: Re: Merging in CVS > > > On Fri, 22 Nov 2002, MacMunn, Robert wrote: > > > I am new to CVS. I am testing out merging. > > > > When I merged 2 files I got extra lines teling me where the merged lines > > where. > > Is there any way around this ? > > > > Ex. > > The <<<<<<< and >>>>> delimit the merged lines. > > No, they delimit conflicts. You can't get around conflicts. You must > resolve them when they occur, and you can't prevent them from occuring, > unless people working independently magically stay out of each other's > way. > > RTFM! > > > _______________________________________________ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
