From 8cb190459318dbdf1733f0de82469541c7799224 Mon Sep 17 00:00:00 2001 From: Mihails Delmans Date: Wed, 5 Feb 2025 15:39:12 +0000 Subject: [PATCH] Switch to develop before merging in the chore workflow --- .github/workflows/chore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/chore.yml b/.github/workflows/chore.yml index 4111d17..8634d32 100644 --- a/.github/workflows/chore.yml +++ b/.github/workflows/chore.yml @@ -27,13 +27,13 @@ jobs: uses: actions/checkout@v4 with: token: ${{ steps.app-token.outputs.token }} - ref: develop - name: Merge Source Branch into Develop run: | git config --global user.name "bot" git config --global user.email "bot@colorifix.com" git fetch origin + git switch develop git merge --no-ff origin/${{ github.event.pull_request.head.ref }} -m "Merge ${{ github.event.pull_request.head.ref }} into develop" git push origin develop