# 核心配置：自动识别文本文件，并强制统一为 LF
* text=auto eol=lf

# 明确排除二进制文件（避免误处理）
*.png binary
*.jpg binary
*.zip binary
*.7z  binary

# 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
