mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-05-17 10:15:22 +00:00
Remove dead merge conflict code.
This commit is contained in:
@@ -45,15 +45,6 @@ func (p *PatchStrategicMergeTransformerPlugin) Config(
|
||||
return fmt.Errorf(
|
||||
"patch appears to be empty; files=%v, Patch=%s", p.Paths, p.Patches)
|
||||
}
|
||||
// TODO(#3723): Delete conflict detection.
|
||||
// Since #1500 closed, the conflict detector in use doesn't do
|
||||
// anything useful. The resmap returned by this method hasn't
|
||||
// been used for many releases. Leaving code as a comment to
|
||||
// aid in deletion (fixing #3723).
|
||||
// _, err = h.ResmapFactory().ConflatePatches(p.loadedPatches)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user