From 0200b4b4ca7dfdb8840e4463da224ea697168729 Mon Sep 17 00:00:00 2001 From: chrischristiansen-glitch Date: Tue, 26 May 2026 00:19:50 +0200 Subject: [PATCH] fix(scripts): rebase before push in sync-gdrive-mirror.sh --- scripts/sync-gdrive-mirror.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/sync-gdrive-mirror.sh b/scripts/sync-gdrive-mirror.sh index 84a2bcd..32c20b9 100755 --- a/scripts/sync-gdrive-mirror.sh +++ b/scripts/sync-gdrive-mirror.sh @@ -14,6 +14,10 @@ SHA=$(git rev-parse --short HEAD) echo "[sync-gdrive-mirror] Tidsstempel: $TIMESTAMP · HEAD: $SHA" +# ── Hent remote-endringer FØR vi skriver noe ────────────────────────────── +echo "[sync-gdrive-mirror] Henter remote-endringer (rebase)..." +git pull --rebase origin main + # ── Bygg header + staleness-varsel ───────────────────────────────────────── cat > "$OUTPUT" << HEADER # VAUCO OS — GDRIVE MIRROR BOOT