From 2fa8d4dc20ab02821b3d17b085a1e4ebd57301e5 Mon Sep 17 00:00:00 2001 From: Bugs5382 Date: Tue, 25 Jun 2024 09:07:52 -0400 Subject: [PATCH] ci: fix merge --- .github/workflows/deploy-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-ci.yaml b/.github/workflows/deploy-ci.yaml index 3fa2dbf..7275dad 100644 --- a/.github/workflows/deploy-ci.yaml +++ b/.github/workflows/deploy-ci.yaml @@ -90,7 +90,7 @@ jobs: git fetch origin git checkout develop git merge origin/main -m "chore(ci): merge main into develop [ci skip]" - git push -o ci.skip origin develop + git push origin develop Docs: runs-on: ubuntu-latest needs: [ 'Release' ]