auto resovle

Shummy1991 · Oct 11, 2023 · 69c2912 · 69c2912
1 parent 0592d8d
commit 69c2912
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/build-storybook.yml b/.github/workflows/build-storybook.yml
@@ -22,7 +22,7 @@ jobs:
           git config --global user.email "[email protected]"
           git fetch
           git checkout storybook
-          git merge main --allow-unrelated-histories
+          git merge main --allow-unrelated-histories --no-ff -X theirs
 
       - run: npm ci
       - run: npm run build-storybook