From b6cc4831ccc9884bc3dc380d8ded0b148f788442 Mon Sep 17 00:00:00 2001 From: jakedahn Date: Wed, 5 Mar 2025 21:42:12 -0700 Subject: [PATCH] Make the deploy script overwrite any uncomitted changes on pull --- typescript/packages/toolshed/deploy/deploy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/typescript/packages/toolshed/deploy/deploy.sh b/typescript/packages/toolshed/deploy/deploy.sh index 7a82efcab..581c336fe 100644 --- a/typescript/packages/toolshed/deploy/deploy.sh +++ b/typescript/packages/toolshed/deploy/deploy.sh @@ -1,4 +1,5 @@ #!/bin/bash cd labs -git pull origin main -sudo systemctl restart toolshed@* \ No newline at end of file +git fetch origin main +git reset --hard origin/main +sudo systemctl restart toolshed@*