From b44bd44666cfa3f68dcb1a600c04afa8560b7db0 Mon Sep 17 00:00:00 2001 From: Till JS Date: Mon, 30 Mar 2026 20:33:21 +0200 Subject: [PATCH] fix(ci): stash local changes before mirror pull to prevent merge conflicts 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 --- .github/workflows/mirror-to-forgejo.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/mirror-to-forgejo.yml b/.github/workflows/mirror-to-forgejo.yml index af7e8bcee..82584822e 100644 --- a/.github/workflows/mirror-to-forgejo.yml +++ b/.github/workflows/mirror-to-forgejo.yml @@ -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)