From ee5cf5a901ea6fb3426bd534d4f3d44a8ce5c28f Mon Sep 17 00:00:00 2001
From: rbswift <50788724+rbswift@users.noreply.github.com>
Date: Fri, 3 May 2024 05:18:25 +1000
Subject: [PATCH] chore: Improve update.sh (#22395)

Pulling without specifying how to reconcile divergent branches is discouraged and produces an ugly "hint" that can be a little disconcerting when running update.sh
---
 update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update.sh b/update.sh
index 38fbd6953..4879594e9 100755
--- a/update.sh
+++ b/update.sh
@@ -28,7 +28,7 @@ echo "Checking out changes to package-lock.json..."
 git checkout package-lock.json
 
 echo "Updating..."
-git pull
+git pull --no-rebase
 
 echo "Installing dependencies..."
 npm ci