MediaWiki locks the whole article (or just a section if the user happens to explicitly choose so), and has no way of doing conflict resolution. It only detects

MediaWiki locks the whole article (or just a section if the user happens to explicitly choose so), and has no way of doing conflict resolution. It only detects it. Actually, the way MediaWiki works was what inspired me to better study the problems of version control and concurrent editing in the first place.