Merge pull request #30777 from ryanhockstad/merge-fix

fix: null merge. closes #30587
pull/30786/head
Robert Sirchia 5 months ago committed by GitHub
commit d9bc0a948c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -283,6 +283,11 @@ func coalesceTablesFullKey(printf printFn, dst, src map[string]interface{}, pref
if dst == nil {
return src
}
for key, val := range dst {
if val == nil {
src[key] = nil
}
}
// Because dest has higher precedence than src, dest values override src
// values.
for key, val := range src {

Loading…
Cancel
Save