From de815efcdd8d30398396657df54f6d57de4696d6 Mon Sep 17 00:00:00 2001 From: Thilo Haas Date: Thu, 8 Aug 2024 14:19:50 +0200 Subject: [PATCH] fix: Update github workflow --- .github/workflows/fork-sync.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 7d740c79dd8..4bf83c1bd40 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -45,11 +45,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | - git fetch origin main - git remote -v - git log -n 20 - git status - git checkout main + 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