Resolve merge conflicts after pull

2026-01-07 22:29:06 +08:00
parent 3d176ca23b
commit 9e99f099ad
4 changed files with 17 additions and 3 deletions
@@ -1,5 +1,19 @@
 # Obsidian PKM 助理工作指南

+
+
+## Memvid MCP memory rules
+
+- Use the `memvid` MCP server only for durable preferences, decisions, and long-lived project context.
+- At the start of each task, query memory before acting.
+  - Use `memvid_search` (or `memvid_search_by_tag` when tags are available).
+- After each task, write back any new durable preferences/decisions/constraints.
+  - Use `memvid_add_text` or `memvid_add_file`, then `memvid_commit`.
+- Never store secrets, tokens, credentials, or transient errors/logs.
+- Use consistent tags like `project`, `decision`, `preference`, `constraint`.
+- Default memory file path: `.claude/memory/memvid.mv2` (override only if user specifies).
+
+
 > 本指南叠加在 Claudian 基础能力之上，专注于个人知识管理的内容整理与组织。

 ---