From dcc40719793d52d43698108a0b0784c2f3b48655 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 17 Jul 2025 09:39:31 -0700
Subject: [PATCH] Stash/pop any local changes before pulling updates

More user customizations will survive without commits.
---
 bin/omarchy-update | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/omarchy-update b/bin/omarchy-update
index 93f7287..50ce43e 100755
--- a/bin/omarchy-update
+++ b/bin/omarchy-update
@@ -10,8 +10,10 @@ else
   last_updated_at=$(git log -1 --format=%cd --date=unix)
 fi
 
-# Get the latest
+# Get the latest while trying to preserve any modifications
+git stash
 git pull
+git stash pop
 
 # Run any pending migrations
 for file in migrations/*.sh; do