RE: Merging in CVS

[MacMunn, Robert]

Thanks.  Looks like merges must be difficult in CVS.  A lot of manual work.

-----Original Message-----
From: Kaz Kylheku [mailto:address@hidden
Sent: Friday, November 22, 2002 12:18 PM
To: MacMunn, Robert
Cc: address@hidden
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!