From 0f154e5f29d734dbca1f9820b8c70781155b04c1 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Sat, 24 Oct 2020 16:45:53 +1030
Subject: [PATCH] Fix invalid syntax for git merge

---
 .github/workflows/publish_api_documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish_api_documentation.yml b/.github/workflows/publish_api_documentation.yml
index b162c48d..9f6fa41e 100644
--- 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