From ed0cb3bce6d4dc33574215ed62cdb958753a5c6a Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <rodriguez@pragmatismo.com.br>
Date: Thu, 30 Apr 2026 22:46:27 -0300
Subject: [PATCH] CI: Simplify git pull in workflow

- Remove error handling wrapper
- Direct git pull command
- Let CI fail naturally on conflicts
---
 .forgejo/workflows/botserver.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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