From 9d2761f5bc7b6382b7cd3dcea36690e374fc0d3c Mon Sep 17 00:00:00 2001
From: Ryan Manuel <ryanm@cypress.io>
Date: Sat, 9 Nov 2024 07:35:29 -0600
Subject: [PATCH] chore: update v8 snapshot cache action to not squash merge on
 conflicts

---
 .github/workflows/update_v8_snapshot_cache.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update_v8_snapshot_cache.yml b/.github/workflows/update_v8_snapshot_cache.yml
index 9b35272ad80c..26516645ab3a 100644
--- a/.github/workflows/update_v8_snapshot_cache.yml
+++ b/.github/workflows/update_v8_snapshot_cache.yml
@@ -135,7 +135,7 @@ jobs:
           git reset --hard
           git checkout ${{ env.BRANCH_NAME }}
           git pull origin ${{ env.BRANCH_NAME }}
-          git merge --squash -Xtheirs stash
+          git merge -Xtheirs stash
       ## Update available and a PR doesn't already exist
       - name: Checkout new branch
         if: ${{ steps.check-need-for-pr.outputs.needs_branch_update != 'true' }}