Use merge function with custom version resolution [#167707118]

ndon55555 · ndon55555 · commit 053605ee8f47 · 2019-08-14T18:53:03.000-04:00
diff --git a/node/node.go b/node/node.go
@@ -41,7 +41,7 @@ func NewContributor(context build.Build) (Contributor, bool, error) {
 		return Contributor{}, false, err
 	}
 
-	plan, wantDependency, err := context.Plans.GetShallowMerged(Dependency)
+	plan, wantDependency, err := context.Plans.GetMerged("node", PriorityPlanMerge)
 	if err != nil {
 		return Contributor{}, false, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func NewContributor(context build.Build) (Contributor, bool, error) {`
`41`	`41`	`return Contributor{}, false, err`
`42`	`42`	`}`
`43`	`43`
`44`		`- plan, wantDependency, err := context.Plans.GetShallowMerged(Dependency)`
	`44`	`+ plan, wantDependency, err := context.Plans.GetMerged("node", PriorityPlanMerge)`
`45`	`45`	`if err != nil {`
`46`	`46`	`return Contributor{}, false, err`
`47`	`47`	`}`