Re: merge losing changes, no Conflict

[Larry Jones]

Paul Sander writes [about .# files in the repository]:
> 
> Or, someone's been checking them in.  Do they show up when you do a
> "cvs status"?

Or more simply, do they end with ,v?  If so, then they're RCS files,
which means that someone has checked in .# files (which isn't a problem
per se, but it might indicate that someone got confused and checked in
CVS backup files).

-Larry Jones

Mom must've put my cape in the wrong drawer. -- Calvin