M thought/my-website-is-one-binary.html → thought/my-website-is-one-binary.html

@@ -198,7 +198,9 @@ #
     # deploy my website
 
     cd /home/j3s/code/j3s.sh
-    if git fetch origin; then
+    git fetch origin
+    if git status | grep -q behind; then
+      git merge origin/main
       go build
       mv j3s.sh /usr/local/bin/j3s.sh
       service j3s.sh restart