[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging in CVS
From: |
Nick Patavalis |
Subject: |
Re: Merging in CVS |
Date: |
Fri, 22 Nov 2002 19:05:08 +0200 |
User-agent: |
Mutt/1.4i |
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
- Merging in CVS, MacMunn, Robert, 2002/11/22
- RE: Merging in CVS, MacMunn, Robert, 2002/11/22
- RE: Merging in CVS, Shankar Unni, 2002/11/22
- Re: Merging in CVS, Thomas S. Urban, 2002/11/22
- Re: Merging in CVS, Larry Jones, 2002/11/22
- Re: Merging in CVS, Kaz Kylheku, 2002/11/22
- Re: Merging in CVS, Eric Siegerman, 2002/11/22
- RE: Merging in CVS, Greg A. Woods, 2002/11/22