From 23db33e6e31f0eead670f84d4656d5f21e6f912f Mon Sep 17 00:00:00 2001 From: Bagatur Date: Tue, 13 Feb 2024 17:22:31 -0800 Subject: [PATCH] conflict resolution --- .github/workflows/api_doc_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/api_doc_build.yml b/.github/workflows/api_doc_build.yml index fcb5d8e1631ac..7f88768c56a62 100644 --- a/.github/workflows/api_doc_build.yml +++ b/.github/workflows/api_doc_build.yml @@ -20,11 +20,11 @@ jobs: 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 + 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"