Skip to content

Commit

Permalink
fixup! fix: overwrite attribute values when not mergeable or resolveable
Browse files Browse the repository at this point in the history
  • Loading branch information
jbedard committed Dec 17, 2024
1 parent 844e000 commit 87ba5e7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions rule/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 87ba5e7

Please sign in to comment.