From 178fc2e81c11b94155ade2625a982c3b3e806116 Mon Sep 17 00:00:00 2001
From: "Rodrigo Rodriguez (Pragmatismo)" <me@rodrigorodriguez.com>
Date: Sat, 18 Apr 2026 19:13:27 -0300
Subject: [PATCH] CI: v19 - Abort rebase first, then reset

- Add git rebase --abort to clear any stuck rebase state
- Then reset --hard + clean
- Prevents 'rebase in progress' errors
---
 .forgejo/workflows/botserver-v2.yaml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/botserver-v2.yaml b/.forgejo/workflows/botserver-v2.yaml
index 632d3106..6a0bd051 100644
--- a/.forgejo/workflows/botserver-v2.yaml
+++ b/.forgejo/workflows/botserver-v2.yaml
@@ -1,7 +1,7 @@
-# HASH-BUSTER-20260418-CONTAINER-v18
+# HASH-BUSTER-20260418-CONTAINER-v19
 # Dev machine approach: /opt/gbo/work/botserver
 # Pre-installed globally: Rust, Node.js, Python, sccache
-# NO REBASE - use merge to avoid conflicts
+# ABORT any rebase first, then reset + pull
 name: BotServer CI/CD
 
 on:
@@ -24,13 +24,22 @@ jobs:
       run: |
         echo "=== Pull Latest ==="
         cd /opt/gbo/work/botserver
+        
+        # Abort any rebase in progress
+        git rebase --abort 2>/dev/null || true
+        
+        # Reset to clean state
         git reset --hard HEAD
         git clean -fd
+        
+        # Pull latest (merge, not rebase)
         git pull
+        
         # Remove .github submodule (causes auth issues)
         rm -rf .github
         grep -v "github" .gitmodules > .gitmodules.tmp || true
         mv .gitmodules.tmp .gitmodules
+        
         # Initialize only required submodules
         git submodule update --init --recursive botlib botserver