Re: locked files, how to handle

[Georg Wilckens]

Larry Jones <address@hidden> wrote:
>  Georg Wilckens writes:

> > the hint. :) :) Maybe I have an misconception regarding locking... can
> > CVS be safely used without locking? Couldn't there be some unsuspected
> > merges when two people commit a file shortly after each other?
>  
>  Of course CVS can be safely used without locking -- the whole *point* of
>  CVS it to allow *concurrent* versioning.  I'm not sure what you mean by
>  an "unsuspected" merge -- CVS won't allow you to commit a file that
>  isn't up to date, you have to explicitly update first.  Updating may
>  merge changes, but it will tell you if it does.

Thanks Larry, I had quite some misconception regarding merging. I can
see clearly now. :)

Regards,
Georg