From 1aeb52caac1a2d31585a018a9270ef74d0864824 Mon Sep 17 00:00:00 2001
From: Bagatur <22008038+baskaryan@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:08:07 -0800
Subject: [PATCH] infra: merge in master during api docs build (#17494)

---
 .github/workflows/api_doc_build.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/api_doc_build.yml b/.github/workflows/api_doc_build.yml
index 31ac26469a..7f88768c56 100644
--- a/.github/workflows/api_doc_build.yml
+++ b/.github/workflows/api_doc_build.yml
@@ -16,6 +16,16 @@ jobs:
         with:
           ref: bagatur/api_docs_build
 
+      - name: Set Git config
+        run: |
+          git config --local user.email "actions@github.com"
+          git config --local user.name "Github Actions"
+
+      - name: Merge master
+        run: | 
+          git fetch origin master
+          git merge origin/master -m "Merge master" --allow-unrelated-histories -X theirs
+
       - name: Set up Python ${{ env.PYTHON_VERSION }} + Poetry ${{ env.POETRY_VERSION }}
         uses: "./.github/actions/poetry_setup"
         with: