ci: fix rebase action

creevey · Apr 26, 2021 · 1729c1e · 1729c1e
1 parent 0a589e1
commit 1729c1e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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