@echo off
echo ================================================
echo Phase 3.1: Sync and Push to Gitea
echo ================================================
echo.

cd /d D:\Hosted\familyhub

echo [1/5] Fetching from Gitea...
git fetch origin

echo.
echo [2/5] Pulling remote commits...
git pull origin main --allow-unrelated-histories --no-edit

echo.
echo [3/5] Adding any new local files...
git add .

echo.
echo [4/5] Creating commit if needed...
git commit -m "Phase 3.1: Add remaining local files" 2>nul
if errorlevel 1 (
    echo No new files to commit, already up to date.
) else (
    echo New files committed successfully.
)

echo.
echo [5/5] Pushing everything to Gitea...
git push origin main

if errorlevel 1 (
    echo.
    echo ================================================
    echo Push failed!
    echo ================================================
    echo.
    echo Try running: git push origin main --force
    echo WARNING: This will overwrite remote history!
    echo.
    pause
    exit /b 1
)

echo.
echo ================================================
echo SUCCESS! All files synced to Gitea!
echo ================================================
echo.
echo View at: https://gitea.hideawaygaming.com.au/jessikitty/family-hub
echo.

pause