diff --git a/Makefile b/Makefile
index ffbd5d0..9c562cb 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,9 @@ shell-%:
 
 update:
 	@echo "Pulling latest code..."
+	@git stash --include-untracked --quiet 2>/dev/null || true
 	git pull
+	@git stash pop --quiet 2>/dev/null || true
 	@if [ ! -f config/mail/mailserver.env ]; then \
 	  echo "Config missing — running setup first..."; \
 	  $(MAKE) setup; \