minor update

GoogleContainerTools · Nov 30, 2020 · 75862c2 · 75862c2
1 parent f9338bc
commit 75862c2
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/pkg/skaffold/errors/err_def.go b/pkg/skaffold/errors/err_def.go
@@ -48,16 +48,17 @@ func (e ErrDef) Error() string {
 
 func (e ErrDef) Unwrap() error {
 	return e.err
-=======
 }
 
 type ErrDef struct {
 	ae proto.ActionableErr
 }
 
 func (e ErrDef) Error() string {
-	return fmt.Sprintf("%s. %s", e.ae.Message, concatSuggestions(e.Suggestions()))
->>>>>>> c0434f6aa (add tests)
+	if s := concatSuggestions(e.Suggestions()); s != "" {
+		return fmt.Sprintf("%s. %s", e.ae.Message, concatSuggestions(e.Suggestions()))
+	}
+	return e.ae.Message
 }
 
 func (e ErrDef) StatusCode() proto.StatusCode {
@@ -68,7 +69,6 @@ func (e ErrDef) Suggestions() []*proto.Suggestion {
 	return e.ae.Suggestions
 }
 
-<<<<<<< HEAD
 func NewError(err error, ae proto.ActionableErr) ErrDef {
 	return ErrDef{
 		err: err,
@@ -77,9 +77,6 @@ func NewError(err error, ae proto.ActionableErr) ErrDef {
 }
 
 func NewErrorWithStatusCode(ae proto.ActionableErr) ErrDef {
-=======
-func NewError(ae proto.ActionableErr) ErrDef {
->>>>>>> c0434f6aa (add tests)
 	return ErrDef{
 		ae: ae,
 	}