diff --git a/.github/workflows/publish_api_documentation.yml b/.github/workflows/publish_api_documentation.yml index 8447eb49..59dc397d 100644 --- a/.github/workflows/publish_api_documentation.yml +++ b/.github/workflows/publish_api_documentation.yml @@ -21,7 +21,7 @@ jobs: python-version: 3.6 - name: Merge changes from 3.0 branch run: | - git merge 3.0 -X theirs + git merge origin/3.0 -X theirs - name: Install dependencies run: | python -m pip install --upgrade pip