From 40107df2ee1af320a0d5f9c0e6b291d1cfed7abf Mon Sep 17 00:00:00 2001 From: "openclaw-docs-sync[bot]" Date: Mon, 27 Apr 2026 08:41:18 +0000 Subject: [PATCH] chore(sync): mirror docs from openclaw/openclaw@231eb7b52a42a1f2cdfa0e5aba3a0fcd163db1be --- .openclaw-sync/source.json | 4 ++-- docs/install/migrating-hermes.md | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.openclaw-sync/source.json b/.openclaw-sync/source.json index 70aad9829..c26844f46 100644 --- a/.openclaw-sync/source.json +++ b/.openclaw-sync/source.json @@ -1,5 +1,5 @@ { "repository": "openclaw/openclaw", - "sha": "f97cc587605c1ea31d0448a23a4bccf61f3ffaf4", - "syncedAt": "2026-04-27T08:38:15.645Z" + "sha": "231eb7b52a42a1f2cdfa0e5aba3a0fcd163db1be", + "syncedAt": "2026-04-27T08:39:52.543Z" } diff --git a/docs/install/migrating-hermes.md b/docs/install/migrating-hermes.md index 11bf129d8..a08a9689c 100644 --- a/docs/install/migrating-hermes.md +++ b/docs/install/migrating-hermes.md @@ -130,6 +130,8 @@ Rerun with `--overwrite` only when replacing the existing target is intentional. For a fresh OpenClaw install, conflicts are unusual. They typically appear when you re-run the import on a setup that already has user edits. +If a conflict surfaces mid-apply (for example, an unexpected race on a config file), Hermes marks remaining dependent config items as `skipped` with reason `blocked by earlier apply conflict` instead of writing them partially. The migration report records each blocked item so you can resolve the original conflict and rerun the import. + ## Secrets Secrets are never imported by default.