✨ Addons: Add functionality for resolveConflicts: PRESERVE#5330

Merged

k8s-ci-robot merged 5 commits intokubernetes-sigs:mainfrom

edmondceausu:addons-preserve

Aug 7, 2025

Commits on Aug 6, 2025

Add functionality for resolveConflicts: PRESERVE
Edmond Ceausu
committed
make generate
edmondceausu
committed
updated documentation and code to reflect kubebuilder behavior
edmondceausu
committed
fixed rebase errors
edmondceausu
committed
make generate after rebase
edmondceausu
committed