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