don't merge patches until they are applied

This commit is contained in:
Natasha Sarkar
2021-01-26 16:43:15 -08:00
parent 48676fe34b
commit 5958edda14

View File

@@ -64,11 +64,10 @@ func (p *plugin) Config(
"patch appears to be empty; files=%v, Patch=%s", p.Paths, p.Patches)
}
// Merge the patches, looking for conflicts.
m, err := h.ResmapFactory().ConflatePatches(p.loadedPatches)
_, err = h.ResmapFactory().ConflatePatches(p.loadedPatches)
if err != nil {
return err
}
p.loadedPatches = m.Resources()
return nil
}