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
2026-08-22 18:49:59 +00:00 · 2024-05-02 21:18:25 +02:00
parent 46f34c8cc7
commit ee5cf5a901
1 changed files with 1 additions and 1 deletions
@@ -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