How to fix This branch is X commits ahead, Y commits behind upstream/main in Git

# Check your remotes
git remote -v

# Expected output:
# origin    https://github.com/YOUR-USERNAME/repo.git (fetch)
# origin    https://github.com/YOUR-USERNAME/repo.git (push)
# upstream  https://github.com/ORIGINAL-OWNER/repo.git (fetch)
# upstream  https://github.com/ORIGINAL-OWNER/repo.git (push)

# If upstream is missing, add it:
git remote add upstream https://github.com/ORIGINAL-OWNER/repo.git

# Verify it was added
git remote -v

# Fetch all branches from upstream
git fetch upstream

# See the difference between your branch and upstream
git log HEAD..upstream/main --oneline

# This shows commits in upstream that you don't have

# To see commits you have that upstream doesn't:
git log upstream/main..HEAD --oneline

# Make sure you're on your main branch
git checkout main

# Fetch upstream changes
git fetch upstream

# Merge upstream into your branch
git merge upstream/main

# If there are conflicts, resolve them:
# 1. Open conflicted files
# 2. Edit to resolve conflicts
# 3. Stage resolved files: git add <file>
# 4. Complete merge: git commit

# Push the merged result to your fork
git push origin main

# Make sure you're on your main branch
git checkout main

# Fetch upstream
git fetch upstream

# Rebase your commits on top of upstream
git rebase upstream/main

# If conflicts occur:
# 1. Resolve conflicts in affected files
# 2. Stage resolved files: git add <file>
# 3. Continue rebase: git rebase --continue
# (repeat for each conflicting commit)

# Force push to update your fork (required after rebase)
git push origin main --force-with-lease

# WARNING: This DELETES all your commits that aren't in upstream!

# First, backup your work if needed:
git branch backup-before-reset

# Fetch upstream
git fetch upstream

# Hard reset to match upstream exactly
git reset --hard upstream/main

# Force push to your fork
git push origin main --force

name: Sync Fork

on:
  schedule:
    - cron: '0 0 * * *'  # Daily at midnight
  workflow_dispatch:  # Manual trigger

jobs:
  sync:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
          token: ${{ secrets.GITHUB_TOKEN }}

      - name: Sync fork
        run: |
          git remote add upstream https://github.com/ORIGINAL-OWNER/repo.git
          git fetch upstream
          git checkout main
          git merge upstream/main
          git push origin main

# 1. Never commit directly to main - use feature branches
git checkout -b my-feature
# ... make changes ...
git push origin my-feature

# 2. Sync before starting new work
git checkout main
git fetch upstream
git merge upstream/main
git push origin main
git checkout -b new-feature

# 3. Keep feature branches short-lived
# Merge or close old branches promptly

# 4. Rebase feature branches before creating PRs
git checkout my-feature
git fetch upstream
git rebase upstream/main