Use origin/3.0 for merge into gh-pages branch.

4 years ago · ca69b01d11
parent dd785b61cf
commit ca69b01d11
1 changed files with 1 additions and 1 deletions
--- 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