RE: Conflicts

[Arthur Barrett]

Steve,

It's been ages since I looked at that code - but from memory, if you
have done a merge previously and got a conflict and not committed since,
then you get C.

Please always include your OS and version of CVS server and client in
all bug reports.  A trace of the problem occurring is even better...

Regards,


Arthur


> -----Original Message-----
> From: 
> address@hidden 
> [mailto:address@hidden
> org] On Behalf Of Glasgow, Steven R CIV USARMY TRAC (US)
> Sent: 20 August 2015 00:03
> To: address@hidden
> Subject: Conflicts
> 
> 
> 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
> 
> 
>