From 2258b6a7a4c50ba749622d843b32bf64d6819f75 Mon Sep 17 00:00:00 2001 From: Pinwheeler Date: Sat, 4 Jan 2025 18:30:29 -0800 Subject: [PATCH] iterate on staging push --- .github/workflows/sync-staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-staging.yml b/.github/workflows/sync-staging.yml index 90c781c..8e0c559 100644 --- 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