From def329b5f2368feeff5d75b5e50ad52865ada874 Mon Sep 17 00:00:00 2001 From: Bagatur <22008038+baskaryan@users.noreply.github.com> Date: Mon, 11 Mar 2024 11:44:37 -0700 Subject: [PATCH] update api build script (#18930) --- .github/workflows/api_doc_build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/api_doc_build.yml b/.github/workflows/api_doc_build.yml index 6f53863d29f..a5014b7110e 100644 --- a/.github/workflows/api_doc_build.yml +++ b/.github/workflows/api_doc_build.yml @@ -38,8 +38,9 @@ jobs: - name: Merge master working-directory: langchain run: | - git fetch origin master - git merge origin/master -m "Merge master" --allow-unrelated-histories -X theirs + git remote add upstream https://github.com/langchain-ai/langchain.git + git fetch upstream master + git merge upstream/master -m "Merge master" --allow-unrelated-histories -X theirs - name: Move google libs run: |