[release-18.0] simplify merging logic (#16525)#16531

systay merged 1 commit intorelease-18.0vitessio/vitess:release-18.0from

backport-16525-to-release-18.0vitessio/vitess:backport-16525-to-release-18.0Copy head branch name to clipboard