From 231eb7b52a42a1f2cdfa0e5aba3a0fcd163db1be Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Mon, 27 Apr 2026 01:38:37 -0700 Subject: [PATCH] docs(migrating-hermes): note partial-apply guard introduced by 8bdfa58cbb Trace to 8bdfa58cbb (fix(migrations): avoid partial Hermes config apply after conflict). Hermes apply now marks remaining dependent config items as "blocked by earlier apply conflict" when a conflict surfaces mid-apply, instead of writing them partially. Document the user-visible reason string and where to find blocked items in the migration report. --- docs/install/migrating-hermes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/install/migrating-hermes.md b/docs/install/migrating-hermes.md index 11bf129d80e..a08a9689c99 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.