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, Steve
_______________________________________________ Bug-cvs mailing list Bug-cvs@nongnu.org https://lists.nongnu.org/mailman/listinfo/bug-cvs
