From 4e19d786ac312177dae788e177106f759d80ad4f Mon Sep 17 00:00:00 2001
From: "Rodrigo Rodriguez (Pragmatismo)" <rodriguez@pragmatismo.com.br>
Date: Wed, 29 Apr 2026 12:56:42 -0300
Subject: [PATCH] fix(ci): git stash before pull to avoid unstaged changes
 error

---
 .forgejo/workflows/botserver.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.forgejo/workflows/botserver.yaml b/.forgejo/workflows/botserver.yaml
index 1c944c39..9c2681e4 100644
--- a/.forgejo/workflows/botserver.yaml
+++ b/.forgejo/workflows/botserver.yaml
@@ -21,6 +21,7 @@ jobs:
       - name: Setup
         run: |
           cd /opt/gbo/work/generalbots
+          git stash 2>/dev/null || true
           OLD_REV=$(git rev-parse HEAD)
           git pull --rebase || { git rebase --abort; git reset --hard origin/main; }
           NEW_REV=$(git rev-parse HEAD)