From f5a2b1ab4f92657a353b320b26fad98d43ad0bab Mon Sep 17 00:00:00 2001
From: jhodgkin <jhodgkin@gmail.com>
Date: Tue, 7 Jul 2026 22:55:03 -0600
Subject: [PATCH] Use git reset --hard in deploy to handle working tree drift

git pull fails if untracked files would be overwritten. Switching to
git fetch + reset --hard keeps the dev LXC in sync unconditionally.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .gitea/workflows/deploy.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 521e570..d974a5f 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -31,7 +31,8 @@ jobs:
               ${{ secrets.DEV_USER }}@${{ secrets.DEV_HOST }} \
               'set -e
                cd /opt/lisilou-portfolio
-               git pull origin main
+               git fetch origin
+               git reset --hard origin/main
                docker compose build
                docker compose up -d
                echo "Deploy complete"'