From 9d824fd5f925b41394d3d172c6e8dd7eaea1a7f6 Mon Sep 17 00:00:00 2001
From: Claude Agent <claude-agent@romfast.ro>
Date: Wed, 1 Apr 2026 09:55:24 +0000
Subject: [PATCH] fix(update): discard local changes before pull on production

Prevents merge conflicts when files were manually edited on the server.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 update.ps1 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/update.ps1 b/update.ps1
index 60a954d..790099d 100644
--- a/update.ps1
+++ b/update.ps1
@@ -56,6 +56,11 @@ if (-not $Silent) {
     $commits | ForEach-Object { Write-Host "    $_" -ForegroundColor DarkGray }
 }
 
+# Discard local changes (productia nu trebuie editata manual)
+Log "==> Discard local changes..." "Cyan"
+git checkout -- . 2>&1 | Out-Null
+git clean -fd 2>&1 | Out-Null
+
 # Git pull
 Log "==> Git pull..." "Cyan"
 $pullOutput = & git -c credential.helper="" pull $fetchUrl 2>&1