From 5f2d46c25bc1856aa3b6eff2cc20c7f0d0ae0247 Mon Sep 17 00:00:00 2001 From: Thilo Haas Date: Thu, 8 Aug 2024 13:56:53 +0200 Subject: [PATCH] fix: Update github workflow --- .github/workflows/fork-sync.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 56d720d5c6c..608b989552d 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -46,6 +46,7 @@ jobs: GH_TOKEN: ${{ github.token }} run: | git checkout main + git pull origin main git merge upstream/main --no-ff --no-edit git push origin main