Re: merge losing changes, no Conflict

[Larry Jones]

Markus Warg writes:
> 
> BTW: I found some .# files (not lockdirectories) in our repository, too.
> Is it okay to have them there or is it a sign that something went
> wrong?

If they're in CVSROOT, that's normal: they're of no use and you should
feel free to delete them.  If they're anywhere else in the repository,
it's a sign that someone has been doing checkouts inside the repository,
which is generally a very bad idea (CVS tries to prevent it, but it's
possible to fool it).

-Larry Jones

I think if Santa is going to judge my behavior over the last year,
I ought to be entitled to legal representation. -- Calvin