From 81601065cc5145fb847c60df599d2b79aa4dee0b Mon Sep 17 00:00:00 2001 From: Srinandan Sridhar <13950006+srinandan@users.noreply.github.com> Date: Tue, 10 Dec 2024 09:22:35 -0800 Subject: [PATCH 1/2] Update gen-docs.yml --- .github/workflows/gen-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml index 53654626..ce06af63 100644 --- a/.github/workflows/gen-docs.yml +++ b/.github/workflows/gen-docs.yml @@ -49,7 +49,7 @@ jobs: git fetch origin main git fetch origin gh_pages git checkout gh_pages - git merge origin/main --allow-unrelated-histories + git merge -s ours origin/main --allow-unrelated-histories GOBIN=/tmp/ go install github.com/google/go-licenses@v1.0.0 /tmp/go-licenses csv ./cmd/apigeecli > third-party-licenses.txt || echo "Ignore warnings" From 232effb96e8d058da6742495108a01757da2bf62 Mon Sep 17 00:00:00 2001 From: Srinandan Sridhar <13950006+srinandan@users.noreply.github.com> Date: Tue, 10 Dec 2024 09:31:18 -0800 Subject: [PATCH 2/2] update strategy --- .github/workflows/gen-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml index ce06af63..be0db1c5 100644 --- a/.github/workflows/gen-docs.yml +++ b/.github/workflows/gen-docs.yml @@ -49,7 +49,7 @@ jobs: git fetch origin main git fetch origin gh_pages git checkout gh_pages - git merge -s ours origin/main --allow-unrelated-histories + git merge -X theirs origin/main --allow-unrelated-histories GOBIN=/tmp/ go install github.com/google/go-licenses@v1.0.0 /tmp/go-licenses csv ./cmd/apigeecli > third-party-licenses.txt || echo "Ignore warnings"