diff --git a/docs/explore-notes/review-merge.md b/docs/explore-notes/review-merge.md index 52494fb4..cb74c29d 100644 --- a/docs/explore-notes/review-merge.md +++ b/docs/explore-notes/review-merge.md @@ -1,8 +1,8 @@ # Review, merge & conflict resolution > **Explore-note — verify before trusting.** Distilled map of a subsystem, not authoritative. -> Last verified against `fc9df7f` (2026-08-11), which added the conventional merge-commit default -> and the `MergeProgress` broadcast. +> Last verified against `168ab1cd` (2026-08-26), which added the batch verify +> (`skipVerify` + `verify_merges`). > Planning mode renders per file and `DiffLinesView` is retired. > Drift check: `git log --oneline 20bce9b..HEAD -- src/ClaudeDo.Worker/Lifecycle src/ClaudeDo.Worker/State src/ClaudeDo.Worker/Planning src/ClaudeDo.Ui/ViewModels/Conflicts src/ClaudeDo.Worker/External` > Stable structure only (no line numbers). See docs/explore-notes/README.md.