From 87ba5e775dae8f30a07501a6d2d59ccb5b68a50b Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Fri, 25 Oct 2024 16:30:44 -0700 Subject: [PATCH] fixup! fix: overwrite attribute values when not mergeable or resolveable --- rule/merge.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rule/merge.go b/rule/merge.go index 249f04260..170fcf614 100644 --- a/rule/merge.go +++ b/rule/merge.go @@ -42,8 +42,9 @@ import ( // a "# keep" comment will be dropped. If the attribute is empty afterward, // it will be deleted. // -// If src has an attribute not present in 'mergeable' and not marked with a -// "# keep" comment, values in the dst attribute will be overwritten. +// If src has an attribute not present in 'mergeable' and the attribute +// does not exist or is not marked with a "# 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