Re: merge losing changes, no Conflict

[Paul Sander]

>--- Forwarded mail from address@hidden

>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).

Or, someone's been checking them in.  Do they show up when you do a
"cvs status"?

>--- End of forwarded message from address@hidden