From e71094598eecc1e911c6352f5107b48a2c14927d Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Fri, 25 Oct 2024 15:48:02 -0700 Subject: [PATCH] fixup! fix: overwrite attribute values when not mergeable or resolveable --- rule/merge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rule/merge.go b/rule/merge.go index cfc2524d6..249f04260 100644 --- a/rule/merge.go +++ b/rule/merge.go @@ -43,7 +43,7 @@ import ( // it will be deleted. // // If src has an attribute not present in 'mergeable' and not marked with a -// "# keep" comment, values in the dist attribute will be overwritten. +// "# keep" comment, values in the dst attribute will be overwritten. func MergeRules(src, dst *Rule, mergeable map[string]bool, filename string) { if dst.ShouldKeep() { return