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