mirror of
https://github.com/sinanyuntu/trade-message-center.git
synced 2026-09-17 13:22:11 +08:00
10 lines
530 B
Plaintext
10 lines
530 B
Plaintext
# 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
|