diff --git a/.forgejo/workflows/botserver.yaml b/.forgejo/workflows/botserver.yaml
index bf533079..a1e0be08 100644
--- a/.forgejo/workflows/botserver.yaml
+++ b/.forgejo/workflows/botserver.yaml
@@ -23,7 +23,10 @@ steps:
 - name: Setup
   run: |
     cd /opt/gbo/work/generalbots
-    git pull
+    if ! git pull; then
+      echo "::error::Git pull failed. Please resolve conflicts manually."
+      exit 1
+    fi
     git log --oneline -1
 
 - name: Build BotServer and BotUI