[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: issue 108
From: |
Larry Jones |
Subject: |
Re: issue 108 |
Date: |
Wed, 22 Dec 2004 10:39:59 -0500 (EST) |
Aldo TENDRON writes:
>
> If there is no markers in the merged file ('<<<<, ===, >>>'), is it save
> to remove by hand the "Result of Merge" text from Entries file ? Or is
> there a case that cvs st should return "File had conflicts on merge"
> even if there is no markers in the merged file ?
You're confused -- "Result of merge" doesn't indicate that the file has
conflicts, it just means that the file was modified by a merge. It
should stay in the Entries file until you commit the changes.
-Larry Jones
You don't get to be Mom if you can't fix everything just right. -- Calvin
- issue 108, Aldo TENDRON, 2004/12/22
- Re: issue 108,
Larry Jones <=