lennartandClaude Opus 5
382f6c7f63
Scenes, prefabs and assets are now marked for UnityYAMLMerge, which is what makes them mergeable at all — without it a scene conflict is resolved by a line-oriented text merge that produces a file Unity may still load and that is quietly wrong. The driver needs a one-time git config per machine; CLAUDE.md carries the command. Line endings are pinned to LF for every text type rather than left to `text=auto`, so the 71 CRLF files vendored in StarterAssets stop being a source of phantom diffs. One exception, and it matters: DialogueTest.unity is marked `binary`. It is a Unity binary SerializedFile rather than YAML, and it contains 128 lone CR bytes — under `*.unity text eol=lf` git would rewrite those as line endings and corrupt the scene. The rule carries the verification command and comes out as soon as the file is genuinely text. LFS is deliberately not enabled: the remote is self-hosted and its LFS support is unverified, and enabling the filter against a server without it breaks pushing. The rules to add later, and the migration step that has to accompany them, are recorded in the file. Co-Authored-By: Claude Opus 5 <[email protected]>