Check for config merge conflicts and duplication.

2026-06-11 00:52:55 +00:00 · 2018-12-29 08:19:37 -08:00
parent 20b13a03e0
commit 8c994725cb
12 changed files with 325 additions and 69 deletions
--- a/pkg/transformers/config/factory.go
+++ b/pkg/transformers/config/factory.go
@@ -53,7 +53,10 @@ func (tf *Factory) FromFiles(
 		if err != nil {
 			return nil, err
 		}
-		result = result.Merge(t)
+		result, err = result.Merge(t)
+		if err != nil {
+			return nil, err
+		}
 	}
 	return result, nil
 }