chore: add shared agent project configuration
This commit is contained in:
9
.gitattributes
vendored
Normal file
9
.gitattributes
vendored
Normal 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
|
||||
Reference in New Issue
Block a user