From 6110b41aa44e4dd0fc832cafc879772f45947c2a Mon Sep 17 00:00:00 2001 From: Arjan Zuidema Date: Mon, 31 Jul 2023 09:10:06 +0200 Subject: [PATCH] Fixed git rebase from master --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d1156b9..baea920 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -50,7 +50,7 @@ jobs: run: | git config --global user.name github-actions git config --global user.email github-actions@github.com - git pull --rebase --autostash + git rebase origin/master git add dist git commit -m "action: build the action" || echo "" git push