elasticsearch/elasticsearch.github.com — pull request #191 by tlrx (2012-05-28 09:45:13+00:00)
Title: Add detail on potential conflicts when merging a mapping

Not so easy to know when merging a mapping will fail because of conflicts.