#!/bin/bash echo "=== AITBC Pull Request Application Guide ===" echo "" echo "Available PRs to apply:" echo "1. aitbc/36-remove-faucet-from-prod-genesis (Production setup)" echo "2. aitbc1/blockchain-production (Blockchain production updates)" echo "" echo "=== Method 1: Merge via Git CLI ===" echo "# Switch to main branch" echo "git checkout main" echo "git pull origin main" echo "" echo "# Merge PR 1 (aitbc server changes)" echo "git merge origin/aitbc/36-remove-faucet-from-prod-genesis" echo "" echo "# Merge PR 2 (aitbc1 server changes)" echo "git merge origin/aitbc1/blockchain-production" echo "" echo "# Push merged changes" echo "git push origin main" echo "" echo "=== Method 2: Web Interface ===" echo "Visit these URLs to merge via web interface:" echo "1. https://gitea.bubuit.net/oib/aitbc/pulls" echo " - Find PR for aitbc/36-remove-faucet-from-prod-genesis" echo " - Click 'Merge Pull Request'" echo "" echo "2. https://gitea.bubuit.net/oib/aitbc/pulls" echo " - Find PR for aitbc1/blockchain-production" echo " - Click 'Merge Pull Request'" echo "" echo "=== Method 3: Cherry-pick (Selective) ===" echo "# Get commit hashes first" echo "git log origin/aitbc/36-remove-faucet-from-prod-genesis --oneline" echo "git log origin/aitbc1/blockchain-production --oneline" echo "" echo "# Cherry-pick specific commits" echo "git checkout main" echo "git cherry-pick " echo "" echo "=== Method 4: Rebase (Clean History) ===" echo "# Rebase main onto PR branches" echo "git checkout main" echo "git pull origin main" echo "git rebase origin/aitbc/36-remove-faucet-from-prod-genesis" echo "git rebase origin/aitbc1/blockchain-production" echo "" echo "=== Recommended Method: Git CLI Merge ===" echo "This preserves PR history and is safest for production" echo "" # Check current status echo "=== Current Status Check ===" echo "Current branch: $(git branch --show-current)" echo "Remote status:" git remote -v echo "" echo "Main branch status:" git log main --oneline -3 2>/dev/null || echo "Main branch not available locally"