From aea21b7d303e38701a2be57f6e66ff5d74bf6e98 Mon Sep 17 00:00:00 2001
From: wKich <w@kich.dev>
Date: Sat, 3 Apr 2021 12:02:16 +0200
Subject: [PATCH] ci: use reset-hard instead of merge

---
 .github/workflows/sync-rebase.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync-rebase.yml b/.github/workflows/sync-rebase.yml
index 75001abc900b..d98516562146 100644
--- 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