Git VPS Sync - Hostinger srv759970

Automate Git synchronization between VPS and GitHub, handling common edge cases that occur during deployments.

Server Info

• Host: 69.62.108.82
• User: automation
• Primary Repo: /var/www/incluzhact
• GitHub: https://github.com/theflysurfer/Site-web-Clem-2
• Branches: main (production), staging (preview)

When to Use This Skill

Invoke automatically when:

• Git pull fails with "unrelated histories"
• Checkout blocked by untracked files
• VPS branch diverged from GitHub
• Merge conflicts during deployment
• Need to force-sync VPS to match GitHub state

Common Scenarios

1. Unrelated Histories

Problem: VPS has independent commit history from GitHub

fatal: refusing to merge unrelated histories

Solutions:

Option A: Merge with allow-unrelated-histories (preserves VPS changes)

ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact
git fetch origin main
git merge origin/main --allow-unrelated-histories -m "Merge GitHub into VPS"
EOF

Use when: VPS has important changes to keep

Option B: Hard reset to GitHub (discards VPS changes)

ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact
git fetch origin main
git reset --hard origin/main
EOF

Use when: VPS should exactly match GitHub (most common)

⚠️ Always verify user intent before hard reset

2. Untracked Files Blocking Operations

Problem: Files like CLAUDE.md, claude.md, nul block checkout/merge

error: The following untracked working tree files would be overwritten by checkout:
	CLAUDE.md
Please move or remove them before you switch branches.

Solution: Clean untracked files

ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact

# List untracked files first (safety check)
echo "Untracked files to remove:"
git status --porcelain | grep '^??'

# Remove untracked files
git clean -fd

# Or remove specific files
rm -f CLAUDE.md claude.md nul
EOF

Safety: Always list files before cleaning

3. Branch Divergence

Problem: VPS and GitHub histories have diverged

Your branch and 'origin/main' have diverged,
and have 5 and 10 different commits each, respectively.

Diagnosis:

ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact

# Show divergence
git log --oneline --graph --all --decorate -20

# Count commits ahead/behind
git rev-list --count origin/main..HEAD  # VPS ahead
git rev-list --count HEAD..origin/main  # VPS behind
EOF

Solutions:

If VPS ahead (has new commits):

# Rebase VPS commits onto GitHub (rewrites history)
ssh automation@69.62.108.82 'cd /var/www/incluzhact && git rebase origin/main'

# Or merge (preserves history)
ssh automation@69.62.108.82 'cd /var/www/incluzhact && git merge origin/main'

If VPS behind (outdated):

# Simple fast-forward pull
ssh automation@69.62.108.82 'cd /var/www/incluzhact && git pull origin main'

If both diverged (conflict):

# Hard reset to match GitHub (safest for deployments)
ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact
git fetch origin main
git reset --hard origin/main
EOF

4. Merge Conflicts

Problem: Conflicting changes between VPS and GitHub

Diagnosis:

ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact

# List conflicted files
git diff --name-only --diff-filter=U

# Show conflict details
git status
EOF

Solutions:

Abort merge and reset:

ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact
git merge --abort
git reset --hard origin/main
EOF

Manual resolution (rare):

# 1. Identify conflicts
ssh automation@69.62.108.82 'cd /var/www/incluzhact && git diff --name-only --diff-filter=U'

# 2. Read conflicted files
ssh automation@69.62.108.82 'cd /var/www/incluzhact && cat path/to/conflicted/file.ts'

# 3. Resolve manually or abort

Pre-Deployment Sync Workflow

Complete workflow for safe VPS sync before deployment:

# Step 1: Check current VPS state
ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact
echo "=== Current branch ==="
git branch --show-current

echo "=== Status ==="
git status --short

echo "=== Last 5 commits ==="
git log --oneline -5

echo "=== Remote comparison ==="
git fetch origin
git log --oneline HEAD..origin/$(git branch --show-current) | wc -l || echo "Up to date"
EOF

# Step 2: Clean untracked files (if any)
ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact
if [ -n "$(git status --porcelain | grep '^??')" ]; then
  echo "Cleaning untracked files..."
  git clean -fd
fi
EOF

# Step 3: Sync with GitHub (choose method)
ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact
BRANCH=$(git branch --show-current)

# Method A: Normal pull (works if no divergence)
if git pull origin $BRANCH 2>&1 | grep -q "fatal\|error"; then
  echo "Pull failed, using hard reset..."
  git fetch origin $BRANCH
  git reset --hard origin/$BRANCH
else
  echo "Pull successful"
fi
EOF

# Step 4: Verify sync
ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact
echo "=== Sync verification ==="
git log --oneline -3
git status
EOF

Quick Commands

Force sync VPS to GitHub (nuclear option)

ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact
BRANCH=$(git branch --show-current)
git clean -fd
git fetch origin $BRANCH
git reset --hard origin/$BRANCH
echo "VPS now matches GitHub $BRANCH"
EOF

Check if VPS needs sync

ssh automation@69.62.108.82 << 'EOF'
cd /var/www/incluzhact
git fetch origin
BRANCH=$(git branch --show-current)
LOCAL=$(git rev-parse HEAD)
REMOTE=$(git rev-parse origin/$BRANCH)

if [ "$LOCAL" = "$REMOTE" ]; then
  echo "✅ VPS is up to date"
else
  echo "⚠️  VPS needs sync"
  echo "Local:  $LOCAL"
  echo "Remote: $REMOTE"
fi
EOF

Switch VPS branch safely

BRANCH="staging"  # or "main"

ssh automation@69.62.108.82 << EOF
cd /var/www/incluzhact

# Clean workspace
git clean -fd
git reset --hard

# Switch branch
git checkout $BRANCH
git pull origin $BRANCH

echo "Switched to $BRANCH"
git log --oneline -3
EOF

Safety Checks

Before any destructive operation (hard reset, clean):

1. Verify current state:

   ssh automation@69.62.108.82 'cd /var/www/incluzhact && git status'
   

2. Check for uncommitted changes:

   ssh automation@69.62.108.82 'cd /var/www/incluzhact && git diff --stat'
   

3. Ask user if unsure:

   # Use AskUserQuestion tool if VPS has diverged commits
   

4. Verify after sync:

   ssh automation@69.62.108.82 'cd /var/www/incluzhact && git log --oneline -5'
   

Troubleshooting

"Permission denied" during git operations

# Check SSH connection
ssh automation@69.62.108.82 'whoami'

# Check Git repo ownership
ssh automation@69.62.108.82 'ls -la /var/www/incluzhact/.git'

# Fix ownership if needed
ssh automation@69.62.108.82 'sudo chown -R automation:automation /var/www/incluzhact'

"Not a git repository"

# Verify repo exists
ssh automation@69.62.108.82 'cd /var/www/incluzhact && git status'

# Re-initialize if needed (DANGEROUS)
ssh automation@69.62.108.82 << 'EOF'
cd /var/www
rm -rf incluzhact
git clone https://github.com/theflysurfer/Site-web-Clem-2.git incluzhact
cd incluzhact
git checkout staging  # or main
EOF

"Could not resolve host 'github.com'"

# Check VPS internet connection
ssh automation@69.62.108.82 'ping -c 3 github.com'

# Check DNS
ssh automation@69.62.108.82 'cat /etc/resolv.conf'

Integration with Deployment

Use this skill before building and restarting PM2:

# 1. Sync Git (this skill)
bash git-vps-sync workflow

# 2. Install dependencies
ssh automation@69.62.108.82 'cd /var/www/incluzhact && npm install'

# 3. Build
ssh automation@69.62.108.82 'cd /var/www/incluzhact && npm run build'

# 4. Restart PM2
ssh automation@69.62.108.82 'pm2 restart incluzhact'

Decision Matrix

Scenario	Recommended Action	Risk
VPS behind GitHub	git pull	Low
Untracked files	git clean -fd	Medium
Diverged histories	git reset --hard origin/branch	High
VPS has unique commits	Ask user, then merge or reset	High
Merge conflict	Abort + reset	Medium

Best Practices

1. Always fetch before comparing: git fetch origin
2. Check status first: git status before destructive ops
3. List before cleaning: Show untracked files before git clean
4. Verify after sync: git log --oneline -3
5. Use hard reset for deployments: VPS should match GitHub exactly
6. Ask user for diverged commits: Don't lose work without confirmation

🔗 Skill Chaining

Skills Required Before

• julien-infra-hostinger-ssh (recommandé): Ensures SSH access is configured before attempting Git operations

Input Expected

• SSH access to VPS configured: automation@69.62.108.82
• Git repository exists at: /var/www/incluzhact
• GitHub remote configured: origin pointing to https://github.com/theflysurfer/Site-web-Clem-2.git
• Target branch known: main (production) or staging (preview)

Output Produced

• Format: VPS Git repository synchronized with GitHub
• Side effects:
  • Untracked files removed (git clean -fd)
  • VPS branch reset to match origin/[branch] exactly
  • Working tree clean (no uncommitted changes)
• Duration: 5-15 seconds (fetch + reset operations)

Compatible Skills After

Obligatoires:

• julien-infra-hostinger-deployment: Deploys the synchronized code (npm install + build + PM2 restart)

Optionnels:

• Direct build/restart: If you manually want to build without full deployment workflow

Called By

• julien-infra-hostinger-deployment: As step 2/7 in complete deployment pipeline
• Direct user invocation: When Git sync issues detected (unrelated histories, diverged branches)
• Git hooks: When pre-deployment validation detects sync needed

Tools Used

• Bash (usage: SSH commands, git fetch/reset/clean operations, git status verification)
• Read (usage: verify ecosystem.config.cjs or deployment config exists)
• AskUserQuestion (usage: confirm hard reset if VPS has diverged commits that may need preservation)

Visual Workflow

User: git push origin staging (on local machine)
    ↓
[Optional] julien-infra-hostinger-ssh (verify SSH access)
    ↓
julien-infra-git-vps-sync (THIS SKILL)
    ├─► SSH to VPS
    ├─► cd /var/www/incluzhact
    ├─► git clean -fd (remove untracked files)
    ├─► git fetch origin [branch]
    ├─► git reset --hard origin/[branch]
    └─► Verify sync: git log --oneline -3
    ↓
VPS Git repository now matches GitHub
    ↓
[Next: julien-infra-hostinger-deployment]
    ├─► npm install
    ├─► npm run build
    ├─► pm2 restart incluzhact-preview
    └─► (continues deployment workflow)

Usage Example

Scenario: After pushing code to GitHub staging, VPS has unrelated histories error during deployment

Command:

# Invoked automatically by deployment skill, or manually:
# "Sync VPS Git repository with GitHub staging branch"

Result:

• VPS /var/www/incluzhact reset to match origin/staging
• Untracked files (CLAUDE.md, nul) removed
• Git status shows clean working tree
• Duration: ~10 seconds
• Ready for npm install + build

Related Skills

• julien-infra-hostinger-ssh: SSH connection management
• julien-infra-hostinger-deployment: Full deployment workflow
• julien-infra-deployment-verifier: Post-deployment verification

Quick Reference

# Safe sync (try pull, fallback to reset)
ssh automation@69.62.108.82 'cd /var/www/incluzhact && git pull || (git fetch && git reset --hard origin/$(git branch --show-current))'

# Nuclear option (match GitHub exactly)
ssh automation@69.62.108.82 'cd /var/www/incluzhact && git clean -fd && git fetch origin && git reset --hard origin/$(git branch --show-current)'

# Check if sync needed
ssh automation@69.62.108.82 'cd /var/www/incluzhact && git fetch && git status'