[Asterisk-Users] CVS best practice

[Kevin P. Fleming]

John Hill wrote:

> The question still left is when I see the M for the /apps/Makefile has the
> make update replaced this if needed, or does the M mean it was left as is
> because had been modified?

"man cvs"

M means CVS merged incoming updates from the CVS repository with your 
local (modified) working copy, without any conflicts. C means it merged 
the incoming updates, but there were conflicts.