✨ refactor: (alpha update) optimize diff generation and add unified conflict detection#5050

k8s-ci-robot merged 1 commit intokubernetes-sigs:masterkubernetes-sigs/kubebuilder:masterfrom

camilamacedo86:add-testscamilamacedo86/kubebuilder:add-testsCopy head branch name to clipboard