Update Dockerfile

Dockerfile

@@ -57,13 +57,6 @@ git config --global user.email "minecraft@huggingface.co"
 git config --global user.name "Minecraft Bot"
 git config --global init.defaultBranch main
 
-# Check if this is a git repo, if not initialize
-if [ ! -d .git ]; then
-    echo "📦 Initializing git repository..."
-    git init
-    git remote add origin https://$GITHUB_TOKEN@github.com/Walukapah/mcserver.git
-fi
-
 # Ensure remote URL has token
 git remote set-url origin https://$GITHUB_TOKEN@github.com/Walukapah/mcserver.git
 
@@ -82,7 +75,7 @@ echo "✅ Git configured successfully"
 mkdir -p /app/logs
 
 # ==========================================
-# BACKUP SCRIPT (Fixed Path)
+# BACKUP SCRIPT (Fixed with Pull Before Push)
 # ==========================================
 cat > /app/mcserver/backup.sh << 'BACKUPSCRIPT'
 #!/bin/bash
@@ -104,7 +97,35 @@ if [ ! -d .git ]; then
     exit 1
 fi
 
-# Check for changes
+# ==========================================
+# STEP 1: Fetch latest changes from GitHub
+# ==========================================
+echo "🔄 Fetching latest changes from GitHub..."
+git fetch origin main 2>&1 || git fetch origin master 2>&1 || {
+    echo "⚠️ Warning: Could not fetch from remote"
+}
+
+# ==========================================
+# STEP 2: Check for remote changes and pull if needed
+# ==========================================
+LOCAL=$(git rev-parse HEAD 2>/dev/null || echo "unknown")
+REMOTE=$(git rev-parse origin/main 2>/dev/null || git rev-parse origin/master 2>/dev/null || echo "unknown")
+
+if [ "$LOCAL" != "$REMOTE" ] && [ "$REMOTE" != "unknown" ]; then
+    echo "📥 Remote has new changes, pulling first..."
+    # Stash local changes, pull, then apply stash
+    git stash push -m "auto-backup-stash" 2>/dev/null || true
+    git pull origin main --rebase 2>&1 || git pull origin master --rebase 2>&1 || {
+        echo "⚠️ Warning: Pull failed, trying merge..."
+        git pull origin main 2>&1 || git pull origin master 2>&1 || true
+    }
+    # Try to pop stash
+    git stash pop 2>/dev/null || true
+fi
+
+# ==========================================
+# STEP 3: Check for local changes
+# ==========================================
 if git diff --quiet && git diff --cached --quiet && [ -z "$(git ls-files --others --exclude-standard)" ]; then
     echo "ℹ️  No changes to backup"
     exit 0
@@ -121,16 +142,47 @@ git commit -m "🎮 Auto backup: $(date '+%Y-%m-%d %H:%M:%S') | Server Data Back
     exit 0
 }
 
-# Push to GitHub
-git push origin main 2>&1 || git push origin master 2>&1 || {
-    echo "❌ ERROR: Failed to push to GitHub!"
-    echo "🔍 Checking remote URL..."
-    git remote -v
-    exit 1
-}
+# ==========================================
+# STEP 4: Push with retry logic
+# ==========================================
+MAX_RETRIES=3
+RETRY_COUNT=0
 
-echo "✅ [BACKUP] Successfully pushed to GitHub!"
-echo ""
+while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
+    # Fetch again to check if remote changed during commit
+    git fetch origin main 2>/dev/null || git fetch origin master 2>/dev/null || true
+    
+    LOCAL=$(git rev-parse HEAD)
+    REMOTE=$(git rev-parse origin/main 2>/dev/null || git rev-parse origin/master 2>/dev/null || echo "unknown")
+    
+    if [ "$LOCAL" != "$REMOTE" ] && [ "$REMOTE" != "unknown" ]; then
+        echo "🔄 Remote changed during commit, pulling again..."
+        git stash push -m "auto-backup-stash-$RETRY_COUNT" 2>/dev/null || true
+        git pull origin main --rebase 2>&1 || git pull origin master --rebase 2>&1 || {
+            git pull origin main 2>&1 || git pull origin master 2>&1 || true
+        }
+        git stash pop 2>/dev/null || true
+        # Re-commit if needed
+        git add -A
+        git commit -m "🎮 Auto backup: $(date '+%Y-%m-%d %H:%M:%S') | Server Data Backup (retry $RETRY_COUNT)" || true
+    fi
+    
+    # Try to push
+    if git push origin main 2>&1 || git push origin master 2>&1; then
+        echo "✅ [BACKUP] Successfully pushed to GitHub!"
+        echo ""
+        exit 0
+    fi
+    
+    RETRY_COUNT=$((RETRY_COUNT + 1))
+    echo "⚠️ Push failed, retrying... ($RETRY_COUNT/$MAX_RETRIES)"
+    sleep 2
+done
+
+echo "❌ ERROR: Failed to push to GitHub after $MAX_RETRIES attempts!"
+echo "🔍 Local HEAD: $LOCAL"
+echo "🔍 Remote HEAD: $REMOTE"
+exit 1
 BACKUPSCRIPT
 
 chmod +x /app/mcserver/backup.sh
@@ -344,7 +396,7 @@ def start_minecraft():
     threading.Thread(target=process_commands, daemon=True).start()
 
 # ==========================================
-# BACKUP API ENDPOINT (Manual Trigger)
+# BACKUP API ENDPOINTS
 # ==========================================
 @app.route('/backup', methods=['POST'])
 def manual_backup():
@@ -354,7 +406,7 @@ def manual_backup():
             ['/app/mcserver/backup.sh'], 
             capture_output=True, 
             text=True, 
-            timeout=60,
+            timeout=120,
             cwd='/app/mcserver'
         )
         return {
@@ -376,15 +428,23 @@ def backup_status():
             timeout=10,
             cwd='/app/mcserver'
         )
+        branch_result = subprocess.run(
+            ['git', 'branch', '--show-current'], 
+            capture_output=True, 
+            text=True,
+            cwd='/app/mcserver'
+        )
+        log_result = subprocess.run(
+            ['git', 'log', '--oneline', '-5'], 
+            capture_output=True, 
+            text=True,
+            cwd='/app/mcserver'
+        )
         return {
             'has_changes': len(result.stdout.strip()) > 0,
             'status': result.stdout,
-            'branch': subprocess.run(
-                ['git', 'branch', '--show-current'], 
-                capture_output=True, 
-                text=True,
-                cwd='/app/mcserver'
-            ).stdout.strip()
+            'branch': branch_result.stdout.strip(),
+            'recent_commits': log_result.stdout.strip().split('\n') if log_result.stdout else []
         }
     except Exception as e:
         return {'error': str(e)}
@@ -1711,6 +1771,7 @@ echo "⌨️ Real-time command typing preview enabled"
 echo "📊 Status modal with heartbeat icon added"
 echo "☁️ GitHub Auto-backup every 5 minutes"
 echo "🔧 Manual backup button added to sidebar"
+echo "🔄 Pull-before-push conflict resolution"
 echo "=========================================="
 
 # Keep container alive