Fix invalid syntax for git merge

4 years ago · 0f154e5f29
parent f9c4c82da6
commit 0f154e5f29
1 changed files with 1 additions and 1 deletions
--- a/.github/workflows/publish_api_documentation.yml
+++ b/.github/workflows/publish_api_documentation.yml
@ -38,5 +38,5 @@ jobs:
        git status
        git commit -m "Publish API documentation"
        git checkout gh-pages
-        git merge 3.0 --theirs
+        git merge 3.0 -X theirs
        git push