From 4af6072c506dd79b0ba525d86660271aff6a8fe1 Mon Sep 17 00:00:00 2001 From: roggervalf Date: Thu, 6 Jul 2023 10:12:54 -0500 Subject: [PATCH] ci(api): add allow-unrelated-histories --- .github/workflows/api.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 61cd68be99..dbc229bc00 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -28,12 +28,12 @@ jobs: run: | git config --global user.email "manast@taskforce.sh" git config --global user.name "manast" - git merge origin/master --no-commit + git merge origin master --no-commit --allow-unrelated-histories yarn pretest yarn docs:json git add . git commit -m "chore(api): update documentation" --no-verify - git push origin/docs-api + git push origin docs-api yarn docs:merge env: CI: true