mirror of
https://github.com/mikefarah/yq.git
synced 2026-09-05 17:36:59 +08:00
* Update docs given https://github.com/yaml/go-yaml/pull/348 * Fix for https://github.com/mikefarah/yq/issues/2677 Depends on https://github.com/yaml/go-yaml/pull/348 * Test for https://github.com/mikefarah/yq/issues/2677 * Remove redundant check and add test case for explicit `!!merge` on `*+` traversal * Bump go.yaml.in/yaml/v4 from 4.0.0-rc.4 to 4.0.0-rc.5
This commit is contained in:
@@ -189,10 +189,6 @@ func mergeObjects(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs
|
||||
|
||||
log.Debugf("going to applied assignment to LHS: %v with RHS: %v", NodeToString(lhs), NodeToString(candidate))
|
||||
|
||||
if candidate.Tag == "!!merge" {
|
||||
continue
|
||||
}
|
||||
|
||||
err := applyAssignment(d, context, pathIndexToStartFrom, lhs, candidate, preferences)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user