tree 10c34e89691969e9c37ae8beae97975a15aa8acb
parent 892be68ca4dae1d8a4dff9b59f20832a311a0ef5
author elix3r <arkosarkar107@gmail.com> 1787920708 +0530
committer GitHub <noreply@github.com> 1787920708 +0100
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsFcBAABCAAQBQJqkYFECRC1aQ7uu5UhlAAAMHEQAHOjMaekPcS4glSqSRI0B1Xu
 fEQ5u+hOLnGBmYLaP6Bun2HoAlsIhbEU+tQ1kQTU5xI84cOYQO4kVneYvW79MuZ7
 LOqytDKRhPG6oBIBgHSD40vLzD5HYJstScefD9YO3Xbs0lSzvnLoulgBMtzvI6gs
 geO9GT1gH4euYoVVXi4OYWG1DqeB6dRVl3wtNKs0rTYG2nOP5LSISdjsd3VnOkLZ
 t4WIXqRm4HhQu9f635iSMSFBAMbgotH8bpl6s4dlNclrFc23HWlEw5/woIz+2SA1
 yuEBgcMaBG0b9OI4Z1Sy3S6gmJ0Wf2vml+TwIclVVovydfO4VXsBn5czl6F0dFPL
 8Dg0jfBtb8MeeH7izwvmxNMQQ8yJk44M5f+KstpiRK0WT9FOlLxFSb6fDgDwCWa/
 ltCvxnLJ6MgT3CimeftPZloU9BLDUIj8SZLjio2kogbtAvWKFvqz/BZwROgNdRz0
 hXkvSgaBUkYt4uksJ8uloqigKf6U/EOTLl+FavUDN83z2YwoHCza8aR7sOOi7KOX
 gclpX3uUPYfKz7ZSyF4TXpNLloc5wqwIAR+CireXK4RKaEIemP/E+TqDyS76f28L
 y3OeMlXgLRtBuZf0TLVigcGFoTA5oHS2F3GYEkVqqJ5IoxSbrV8H9nnC4oMy6vUi
 AEjZnKyiZvCIYrC9JL3I
 =+OVD
 -----END PGP SIGNATURE-----
 

Fix update(merge_objects=true) throwing on primitive-to-object merge (#5414)

When merge_objects is true, recurse only if the existing value is an
object. Otherwise overwrite, matching the documented "all other values
are overwritten as usual" behavior.

Fixes #5402

Signed-off-by: elix3r <157088510+22elix3r@users.noreply.github.com>