conflict resolution

langchain-ai · Feb 14, 2024 · 23db33e · 23db33e
1 parent 8ed3d55
commit 23db33e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 "[email protected]"
           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"