Mixer/hermes-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: stage state_merged.db after merge

Browse Source
This commit is contained in:
Mixer
2026-04-14 08:23:33 +09:00
parent 2dce9223e0
commit 738bd5b762
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sync.sh
View File

@@ -155,7 +155,10 @@ finally:
shutil.rmtree(tmpdir, ignore_errors=True) shutil.rmtree(tmpdir, ignore_errors=True)
PYEOF 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 if [ "$HAS_LOCAL" = true ]; then
git commit -m "Sync $(date '+%Y-%m-%d %H:%M')" 2>/dev/null || true git commit -m "Sync $(date '+%Y-%m-%d %H:%M')" 2>/dev/null || true
if ! git push origin main 2>&1; then if ! git push origin main 2>&1; then