From 3c919876391ad193d7b0e865e8e48e513797ed8a Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 21 Aug 2023 14:54:58 -0700 Subject: [PATCH] Update generate-javascript.yml --- .github/workflows/generate-javascript.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/generate-javascript.yml b/.github/workflows/generate-javascript.yml index d18371ba18..c04c9fdafe 100644 --- a/.github/workflows/generate-javascript.yml +++ b/.github/workflows/generate-javascript.yml @@ -33,6 +33,8 @@ jobs: git config --global user.name "Github Actions" git config --global user.email "<>" git cherry-pick --strategy=recursive -X theirs c557f7f + # apply https://github.com/kubernetes-client/gen/pull/237 + git cherry-pick --strategy=recursive -X theirs 7edb192 rm -rf gen/.git - name: Generate Branch Name run: |