Re: Merging in CVS

[Nick Patavalis]

On Fri, Nov 22, 2002 at 11:35:17AM -0500, MacMunn, Robert wrote:
> 
> When I merged 2 files I got extra lines teling me where the merged lines
> where.
> Is there any way around this ?

The extra lines with <<<< and >>>>> appear only when there are
conflicts in the merged files. They are a feature, not a bug, since
they indicate that CVS cannot decide, by itself, what to do. You have
to manually edit these places.

/npat

-- 
A commune is where people join together to share their lack of wealth.
  -- Richard M. Stallman