till/managarten
1
0
Fork 0
mirror of https://github.com/Memo-2023/mana-monorepo.git synced 2026-05-14 22:21:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(ci): stash local changes before mirror pull to prevent merge conflicts

Browse source 
The mirror workflow runs git pull on the server's working directory,
which fails if there are uncommitted changes (e.g., from manual edits).
Adding git stash before pull prevents this.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Till JS 2026-03-30 20:33:21 +02:00
parent 81ae60d184
commit b44bd44666
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/mirror-to-forgejo.yml vendored
View file

@ -19,6 +19,8 @@ jobs:
run: |
cd /Users/mana/projects/manacore-monorepo
# Stash any local changes so pull never fails
git stash --quiet 2>/dev/null || true
git pull origin main
# Push to Forgejo via localhost SSH (runner is on the Mac Mini)