diff --git a/.github/workflows/publish_api_documentation.yml b/.github/workflows/publish_api_documentation.yml index faaee3c5..b162c48d 100644 --- a/.github/workflows/publish_api_documentation.yml +++ b/.github/workflows/publish_api_documentation.yml @@ -37,5 +37,6 @@ jobs: git add docs git status git commit -m "Publish API documentation" - git checkout --theirs gh-pages + git checkout gh-pages + git merge 3.0 --theirs git push