From 9d0dde5c118ef412b9b00f1a23109496a2b6e6dc Mon Sep 17 00:00:00 2001 From: Thilo Haas Date: Thu, 8 Aug 2024 14:20:48 +0200 Subject: [PATCH] fix: Update github workflow --- .github/workflows/fork-sync.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 4bf83c1bd40..f4f87344c02 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -47,8 +47,8 @@ jobs: run: | git log --oneline -n 30 git pull origin main - git merge upstream/main --no-ff --no-edit --allow-unrelated-histories -v - git push origin main + git rebase upstream/main + git push origin main --force-with-lease - name: Check and update package.json name field if needed if: steps.get_latest_tag_origin.outputs.latest_tag != steps.get_latest_tag.outputs.latest_tag