Merge branch '2.10'

sp4ce · Sep 12, 2019 · 60d8a0b · 60d8a0b
2 parents c3d432f + a037f98
commit 60d8a0b
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/MapperFeature.java b/src/main/java/com/fasterxml/jackson/databind/MapperFeature.java
@@ -363,9 +363,8 @@ public enum MapperFeature implements ConfigFeature
      * merging is skipped and new value is created (<code>true</code>) or
      * an exception is thrown (false).
      *<p>
-     * Feature is disabled by default since non-mergeable property types are ignored
-     * even if defaults call for merging, and usually explicit per-type or per-property
-     * settings for such types should result in an exception.
+     * Feature is enabled by default, to allow use of merge defaults even in presence
+     * of some unmergeable properties.
      */
     IGNORE_MERGE_FOR_UNMERGEABLE(true)