fixed merge conflict

GoogleContainerTools · Aug 29, 2018 · 8747bf9 · 8747bf9
2 parents 9229993 + 939e6cf
commit 8747bf9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/skaffold/deploy/kubectl/cli.go b/pkg/skaffold/deploy/kubectl/cli.go
@@ -62,7 +62,7 @@ func (c *CLI) Apply(ctx context.Context, out io.Writer, manifests ManifestList)
 	buf := bytes.NewBuffer([]byte{})
 	writer := bufio.NewWriter(buf)
 	if err := c.Run(ctx, manifests.Reader(), writer, "apply", c.Flags.Apply, "-f", "-"); err != nil {
-		if !strings.Contains(string(buf.Bytes()), "field is immutable") {
+		if !strings.Contains(buf.String(), "field is immutable") {
 			return nil, err
 		}
 		// If the output contains the string 'field is immutable', we want to delete the object and recreate it