ci: use reset-hard instead of merge

creevey · Apr 3, 2021 · aea21b7 · aea21b7
1 parent 6efa983
commit aea21b7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/sync-rebase.yml b/.github/workflows/sync-rebase.yml
@@ -26,8 +26,8 @@ jobs:
         run: |
           git remote add upstream https://github.com/storybookjs/storybook.git
           git fetch upstream
-          git merge upstream/master
-          git push
+          git reset upstream/master --hard
+          git push origin --force
       - name: Rebase creevey branch
         run: |
           git checkout creevey