From f224ef7b7c9ba1cc6819c3b7bf84119d7ce5ec9b Mon Sep 17 00:00:00 2001 From: rbswift <50788724+rbswift@users.noreply.github.com> Date: Sat, 2 Sep 2023 17:08:09 +1000 Subject: [PATCH] chore: Improve update script in case of local changes (#18837) * Stash local changes to prevent update failing Call git stash to stash any local changes that would prevent the update.sh script from failing * Update update.sh changed to git checkout package-lock.json --- update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/update.sh b/update.sh index f9010c8e..77cb4998 100755 --- a/update.sh +++ b/update.sh @@ -17,6 +17,9 @@ fi echo "Creating backup of configuration..." cp -R data data-backup +echo "Checking out changes to package-lock.json..." +git checkout package-lock.json + echo "Updating..." git pull