From 2f093b89159f43dafe3ac7cf49a1f0bb539bafb0 Mon Sep 17 00:00:00 2001 From: Mihails Delmans Date: Wed, 5 Feb 2025 15:29:01 +0000 Subject: [PATCH] Add fetch before merging in chore workflow --- .github/workflows/chore.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/chore.yml b/.github/workflows/chore.yml index c24e96b..4111d17 100644 --- a/.github/workflows/chore.yml +++ b/.github/workflows/chore.yml @@ -33,6 +33,7 @@ jobs: run: | git config --global user.name "bot" git config --global user.email "bot@colorifix.com" + git fetch origin 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