Merge origin/main: rebase documents pin onto updated documents main

Browse Source

Why: 任务期间 origin/main 前进（#259 记录 RDM 评审并将 documents pin
提到 9505c7e）；task-sync 并入 main 时与本分支 pin 修改在 gitlink 冲突。
按 pin 纪律先验证祖先关系（旧 pin d630a04 是 documents main 祖先），
将文档提交 rebase 到 9505c7e 之上（新 head 4ce8155 包含双方全部内容），
以 rebase 后 head 解决冲突，无内容丢失。

Evidence: git -C modules/documents merge-base --is-ancestor 双向通过；
rebase 无冲突；SRC=SELF。

Impact: documents gitlink 从 73ec4c8 改为 4ce8155（内容超集）。

Refs: feature/architecture-guides 任务。

...

This commit is contained in:

weichen

2026-10-08 09:33:28 +00:00

parent 4e856f17aa f2d39354b4

commit 6167c1012e

3 changed files with 181 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

.task/archive/feature-rdm-status-review.md

+142

File diff suppressed because one or more lines are too long

.task/feature-architecture-guides.md

+38

File diff suppressed because one or more lines are too long

modules/documents

+1 -1

Submodule modules/documents updated: 73ec4c8b61...4ce8155161