Re: File Status with multiple update and conflicts

[Jim Hyslop]

Aldo TENDRON wrote:
> Hello,
>
> I'm searching information on this behavior : 
>
> I have a file, with 'Needs Merge' status. After 'cvs up', some conflicts
> appear, and status is 'File has conflicts on merge'. If conflicts are
> still here when a new revision is committed in CVS, the status changes
> to 'Needs Merge', even if conflicts markers are still in the file. If I
> perform a 'cvs up' again that doesn't add new conflicts, the status is
> 'Locally Modified'.
>
> I thought it would be 'File has conflicts on merge' again, because the
> first conflicts isn't resolved ?
>  

Generally, you should resolve conflicts immediately, rather than trying 
to apply another update. By updating without resolving the conflicts, 
you are in effect telling CVS "It's OK, you can ignore those conflicts."

--
Jim