[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging in CVS

From: Kaz Kylheku
Subject: Re: Merging in CVS
Date: Fri, 22 Nov 2002 09:18:03 -0800 (PST)

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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]