Kip Warner writes: > But is locking even necessary in this day and age when we can allow > merging in most major SCMs? Maybe not *necessary*, but probably desirable for cases where we don't have a good automatic merge tool.