[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


From: Glasgow, Steven R CIV USARMY TRAC (US)
Subject: Conflicts
Date: Wed, 19 Aug 2015 14:15:24 +0000

Something strange happens from time to time.  I haven't found a reproducible
pattern to it.

Sometimes CVS indicates conflicts in files when 1) none of those files have
changed locally, 2) some of those files may have been changed in the
repository, and 3) there are no <<<<< >>>>> markers in the files after the
cvs update command.

Solution, so far, is to delete those files locally and do another cvs
update.  This pulls down the latest copy from the repository again.

Does anyone know of why this situation might be occurring?

Thank you,

reply via email to

[Prev in Thread] Current Thread [Next in Thread]