From eef15d3f4eb0e5d952f236c26cef6b0e82387c31 Mon Sep 17 00:00:00 2001 From: Thilo Haas Date: Thu, 8 Aug 2024 14:28:41 +0200 Subject: [PATCH] fix: Update github workflow --- .github/workflows/fork-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index d6b2172c51d..8d40be9f06f 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -49,7 +49,7 @@ jobs: git config branch.main.merge refs/heads/main git config pull.rebase true git pull origin main - git rebase upstream/main + git pull upstream main git push origin main --force-with-lease - name: Check and update package.json name field if needed