Skip to content

Commit 2b9fa5b

Browse files
docs: Clarify error on strategic merge failure
Resolves #5997. Signed-off-by: Carlos Nunez <[email protected]>
1 parent de01137 commit 2b9fa5b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

plugin/builtin/patchtransformer/PatchTransformer.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ func (p *plugin) Config(h *resmap.PluginHelpers, c []byte) error {
6868
}
6969
if errSM != nil && errJson != nil {
7070
return fmt.Errorf(
71-
"unable to parse SM or JSON patch from %s", p.patchSource)
71+
"unable to parse SM or JSON patch from %s; SM error: %s, JSON6902 error: %s",
72+
p.patchSource,
73+
errSM.Error(),
74+
errJson.Error())
7275
}
7376
if errSM == nil {
7477
p.smPatches = patchesSM

0 commit comments

Comments
 (0)