Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# =========================
# Text files: LF normalized
# =========================
* text=auto eol=lf

# =========================
# Unity / C# / UI Toolkit
# =========================
*.cs text eol=lf
*.uxml text eol=lf
*.uss text eol=lf
*.shader text eol=lf
*.compute text eol=lf
*.meta text eol=lf

# =========================
# Documentation / Config
# =========================
*.md text eol=lf
*.txt text eol=lf
*.json text eol=lf
*.yml text eol=lf
*.yaml text eol=lf

# =========================
# Binary assets
# =========================
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.psd binary
*.wav binary
*.mp3 binary
*.ogg binary
*.ttf binary
*.otf binary
*.fbx binary
*.unity binary
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Treat Unity scene files as text, not binary

Marking *.unity as binary prevents Git from doing line-based diffs and merges on scene files, which are YAML text. This makes resolving concurrent edits to scenes much harder (Git won’t attempt textual merges and most tooling will treat the file as opaque), so collaborating on scene changes becomes painful and conflicts are more likely to require manual rework. Consider keeping *.unity as text eol=lf like other Unity YAML assets.

Useful? React with 👍 / 👎.