From c47f93219bcd3dff41ae6e65270fed055908d9af Mon Sep 17 00:00:00 2001
From: LitoMore <LitoMore@users.noreply.github.com>
Date: Tue, 27 Jun 2023 03:20:34 +0800
Subject: [PATCH] Adjust `deploy-review-app` script (#9317)

---
 .github/scripts/deploy-review-app.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/scripts/deploy-review-app.sh b/.github/scripts/deploy-review-app.sh
index bcd6cf9929..4b356c928a 100755
--- a/.github/scripts/deploy-review-app.sh
+++ b/.github/scripts/deploy-review-app.sh
@@ -10,12 +10,11 @@ org="shields-io"
 # This will fail if $PR_NUMBER is not a valid PR
 pr_json=$(curl --fail "https://api.github.com/repos/badges/shields/pulls/$PR_NUMBER")
 
-# Attempt to apply the PR diff to the target branch
-# This will fail if it does not merge cleanly
+# Checkout the PR branch
 git config user.name "actions[bot]"
 git config user.email "actions@users.noreply.github.com"
 git fetch origin "pull/$PR_NUMBER/head:pr-$PR_NUMBER"
-git merge "pr-$PR_NUMBER"
+git checkout "pr-$PR_NUMBER"
 
 # If the app does not already exist, create it
 if ! flyctl status --app "$app"; then
-- 
GitLab