From 5ca6022d007bc83daba1e7297480d37f56554455 Mon Sep 17 00:00:00 2001
From: Moritz Poldrack <git@moritz.sh>
Date: Fri, 29 Jul 2022 22:31:54 +0200
Subject: lint: ensure errors are at least logged (errcheck)

Signed-off-by: Moritz Poldrack <moritz@poldrack.dev>
Acked-by: Robin Jarry <robin@jarry.cc>
---
 config/config.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'config/config.go')

diff --git a/config/config.go b/config/config.go
index 249fa278..e87dccfc 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1042,7 +1042,10 @@ func (config AercConfig) mergeContextualUi(baseUi UIConfig,
 			continue
 		}
 
-		mergo.Merge(&baseUi, contextualUi.UiConfig, mergo.WithOverride)
+		err := mergo.Merge(&baseUi, contextualUi.UiConfig, mergo.WithOverride)
+		if err != nil {
+			logging.Warnf("merge ui failed: %v", err)
+		}
 		if contextualUi.UiConfig.StyleSetName != "" {
 			baseUi.style = contextualUi.UiConfig.style
 		}
-- 
cgit