fix: force push 5 (#9467)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
ParabolInc · Feb 28, 2024 · 581f0cf · 581f0cf
1 parent e67ca91
commit 581f0cf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/release-to-staging.yml b/.github/workflows/release-to-staging.yml
@@ -103,7 +103,7 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git checkout -b "release/v${{ env.ACTION_VERSION }}"
-          git merge -s ours origin/production
+          git merge -s ours origin/production --allow-unrelated-histories
           git push --set-upstream origin "release/v${{ env.ACTION_VERSION }}"
           gh pr create \
             --assignee ${{ github.actor }} \