From 49f2e0c76db4fd60e70f7b6c6aac3168bd8fed26 Mon Sep 17 00:00:00 2001 From: wKich Date: Mon, 19 Apr 2021 09:35:21 +0200 Subject: [PATCH] ci: fix rebase action --- .github/workflows/sync-rebase.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sync-rebase.yml b/.github/workflows/sync-rebase.yml index 5a0109c4794a..b7f986cd5f0d 100644 --- a/.github/workflows/sync-rebase.yml +++ b/.github/workflows/sync-rebase.yml @@ -28,6 +28,7 @@ jobs: git fetch upstream - name: Rebase creevey branch run: | + git reset upstream/master --hard git cherry-pick master..HEAD git push origin --force - name: Rebase master branch