finn/omarchy
1
0
Fork 0
mirror of https://github.com/basecamp/omarchy.git synced 2025-07-27 12:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #220 from rmacklin/reset-any-stash-conflicts-before-proceeding-in-omarchy-update

Browse Source 
Reset any stash changes before proceeding if there were conflicts
This commit is contained in:
David Heinemeier Hansson
2025-07-18 14:40:39 -07:00
committed by GitHub
parent f388e90d3b 4bb8afde02
commit 2b0c56bbb1
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/omarchy-update
View File

@ -12,6 +12,7 @@ fi
# Get the latest while trying to preserve any modifications # Get the latest while trying to preserve any modifications
git pull --autostash git pull --autostash
git diff --check || git reset --merge
# Run any pending migrations # Run any pending migrations
for file in migrations/*.sh; do for file in migrations/*.sh; do