I think that it depends on the case.
Would you take a plane if you know that the files that control the plane were changed simultanously by many people and then merged?
In silly applications merge approach can be used, but if we are talking about serious systems.... like bank systems, etc...