Initialize Trellis project guidelines

This commit is contained in:
que01 committed 2026-08-03 10:56:21 +08:00
1 parent 7f4ebe8fb7
commit 4c5981c555
166 files changed
+28564

No files matched your search

+9
View File
@@ -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