iterate on staging push

Parrit · Jan 5, 2025 · 2258b6a · 2258b6a
1 parent 8f81000
commit 2258b6a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/sync-staging.yml b/.github/workflows/sync-staging.yml
@@ -24,7 +24,7 @@ jobs:
         run: git fetch origin main
 
       - name: Merge main into staging
-        run: git merge origin/main --no-ff --no-edit --allow-unrelated-histories
+        run: git merge origin/main --no-edit --allow-unrelated-histories
 
       - name: Push changes to staging
         run: git push origin staging