cvs update when we have a conflict

0

I am trying to update my local file with CVS UPDATE. I see the differences in CVS diff, but when doing cvs update I get nothing changed and I see M before my file name in the output. What is that and how to get my file updated?

Dhiaa Eddin Anabtawi

Posted 2020-02-14T13:15:33.760

Reputation: 1

Sorry, I know you probably won't like this, but can you change your version control system software? I mean the latest CVS release is from 2008. – Aulis Ronkainen – 2020-02-14T13:23:36.120

No answers