Locking is just punting on the problem. If a version control system can't merge non-conflicting changes to the same file by different people, that file is unmai

Locking is just punting on the problem. If a version control system can't merge non-conflicting changes to the same file by different people, that file is unmaintainable and shouldn't have been checked in as if it were source code. Instead it should be generated from a set of files that can be edited normally.