[8.18] Add --resolve-conflict flag to transport version generate task (#134421)#134662

elasticsearchmachine merged 1 commit intoelastic:8.18elastic/elasticsearch:8.18from

rjernst:backport/8.18/pr-134421rjernst/elasticsearch:backport/8.18/pr-134421Copy head branch name to clipboard