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 ? -- Aldo Tendron _______________________________________________ Info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
