On Tuesday, February 15, David Thornley wrote:
> 
> Besides, there are things that cannot be developed concurrently,
> since they are unmergeable, for good reasons or bad.  These have
> to have some form of lock.

No, they do not *require* some form of lock.  Using some form of
lock is one way of dealing with these files.  Simple selection to
resolve the conflict is another.

--Toby.

Reply via email to