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

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

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