From 10eac1fda1a8a8ca0c9e063998b7af068eb32ef7 Mon Sep 17 00:00:00 2001 From: Dmitrii Iurco Date: Wed, 29 Apr 2026 09:10:00 -0400 Subject: [PATCH] fix: make update stashes runtime config before pull to avoid merge conflicts Runtime config files exist on disk but are now gitignored. A bare git pull conflicts with them. Stash (including untracked) before pulling and pop after. Co-Authored-By: Claude Sonnet 4.6 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) 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; \