From 3a136a46a10a276ddd740d4e9ed8ddcf048b54b6 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Oct 2020 16:07:48 +1030 Subject: [PATCH 1/3] 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 From f9c4c82da66e0bbde89c8cc01775fda222336787 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Oct 2020 16:12:17 +1030 Subject: [PATCH 2/3] 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 From 0f154e5f29d734dbca1f9820b8c70781155b04c1 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Oct 2020 16:45:53 +1030 Subject: [PATCH 3/3] 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