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 Oct 25, 2024
1 parent ea31c84 commit e710945
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rule/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e710945

Please sign in to comment.