升级 Trellis 并完成项目审查(07-26-trellis-upgrade-project-audit)
这个提交包含在:
@@ -0,0 +1,9 @@
|
||||
# Trellis: append-only developer journals should merge cleanly across
|
||||
# parallel sessions/worktrees — each session only appends a new block, so
|
||||
# there is nothing to actually conflict on.
|
||||
#
|
||||
# Do NOT add a rule for workspace/*/index.md here — it is fully regenerated
|
||||
# every session, so a real conflict there is expected and safe to resolve by
|
||||
# picking either side (task state lives in task.json, not index.md). See
|
||||
# .trellis/spec/cli/backend/directory-structure.md for details.
|
||||
.trellis/workspace/*/journal-*.md merge=union
|
||||
在新工单中引用
屏蔽一个用户