From f9c4c82da66e0bbde89c8cc01775fda222336787 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Sat, 24 Oct 2020 16:12:17 +1030
Subject: [PATCH] Fix merge issues on gh-pages branch, second try.

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

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