From 738bd5b7623b58cadcbc5e4cba3cb8925455ddb2 Mon Sep 17 00:00:00 2001 From: Mixer Date: Tue, 14 Apr 2026 08:23:33 +0900 Subject: [PATCH] Fix: stage state_merged.db after merge --- sync.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sync.sh b/sync.sh index 3f1d9a0..ed52391 100755 --- a/sync.sh +++ b/sync.sh @@ -155,7 +155,10 @@ finally: shutil.rmtree(tmpdir, ignore_errors=True) PYEOF -# ── Step 5: Push ───────────────────────────────────────────────────────── +# ── Step 5: Stage merged DB (it was just created in Step 4) ───────────── +git add state_merged.db 2>/dev/null || true + +# ── Step 6: Push ───────────────────────────────────────────────────────── if [ "$HAS_LOCAL" = true ]; then git commit -m "Sync $(date '+%Y-%m-%d %H:%M')" 2>/dev/null || true if ! git push origin main 2>&1; then