From ad5bfebd4600141e5c08e2370a332dc33f4d2923 Mon Sep 17 00:00:00 2001
From: Izan Gil <66965250+SrIzan10@users.noreply.github.com>
Date: Sun, 22 Sep 2024 00:29:30 +0200
Subject: [PATCH] ci: fix git issues

---
 .github/workflows/docs.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 78c9238..2c607f3 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -19,13 +19,13 @@ jobs:
           token: '${{ secrets.GITHUB_TOKEN }}'
       - run: corepack enable yarn
       - run: yarn install
-      - run: git checkout -b typedoc
+      - run: git checkout -b typedoc || git checkout typedoc
       - run: git pull origin main
-      - run: git push origin typedoc
+      - run: git merge main
       - run: yarn typedoc
       - run: git add .
       - name: Set outputs
         id: vars
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
       - run: git commit -m "Update typedoc to commit ${{ steps.vars.outputs.sha_short }}"
-      - run: git push --set-upstream origin typedoc
\ No newline at end of file
+      - run: git push origin typedoc
\ No newline at end of file