Skip to content

K
k3s
Commit b6ca9212 authored by Brendan Burns's avatar Brendan Burns
Browse files
Options

Merge pull request #16980 from jackgr/force_apply

Implement conflict detection in strategic merge patch
parents 09f70ebb b11dec7a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubectl/cmd/apply.go
View file @ b6ca9212
...@@ -151,7 +151,7 @@ func RunApply(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, options *Ap ...@@ -151,7 +151,7 @@ func RunApply(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, options *Ap
} }
// Compute a three way strategic merge patch to send to server. // Compute a three way strategic merge patch to send to server.
patch, err := strategicpatch.CreateThreeWayMergePatch(original, modified, current, info.VersionedObject, false) patch, err := strategicpatch.CreateThreeWayMergePatch(original, modified, current, info.VersionedObject, true)
if err != nil { if err != nil {
format := "creating patch with:\noriginal:\n%s\nmodified:\n%s\ncurrent:\n%s\nfrom:\n%v\nfor:" format := "creating patch with:\noriginal:\n%s\nmodified:\n%s\ncurrent:\n%s\nfrom:\n%v\nfor:"
return cmdutil.AddSourceToErr(fmt.Sprintf(format, original, modified, current, info), info.Source, err) return cmdutil.AddSourceToErr(fmt.Sprintf(format, original, modified, current, info), info.Source, err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment