From 70924fe24784c742ef5501a96963a547aaa13d97 Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <rodriguez@pragmatismo.com.br>
Date: Thu, 30 Apr 2026 21:39:55 -0300
Subject: [PATCH] ci: Add error handling for git pull failures

---
 .forgejo/workflows/botserver.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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