From d9ab80e096d18d7320b5a417d0c9418d5c099561 Mon Sep 17 00:00:00 2001 From: Nils Pukropp Date: Mon, 16 Feb 2026 17:54:13 +0100 Subject: [PATCH] deleted update website --- update_website.sh | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100755 update_website.sh diff --git a/update_website.sh b/update_website.sh deleted file mode 100755 index c1d33e7..0000000 --- a/update_website.sh +++ /dev/null @@ -1,10 +0,0 @@ -sudo docker compose down -git pull origin main -git merge main -CONFLICTS=$(git ls-files -u | wc -l) -if [ "$CONFLICTS" -gt 0 ] ; then - echo "There are merge conflicts, resolve them and run `sudo docker compose up -d --build` or abort with `git merge --abort`" - exit -1 -fi - -sudo docker compose up -d --build