Template
akritikos
243a3ce519
merge=upstream-wins named a driver that is not built in and is not defined in any git config, so git silently fell back to the default 3-way merge. Custom merge drivers live in .git/config and cannot be distributed via .gitattributes, so downstream clones never had it. merge=union on Directory.Packages.props silently produced duplicate PackageVersion entries when both sides changed the same Include, which NuGet rejects at build time with no conflict to review. No tracked blob is stored with CRLF, so text=auto is a no-op for existing content and only guards future contributions.
4 lines
42 B
Plaintext
4 lines
42 B
Plaintext
* text=auto
|
|
*.png binary
|
|
*.cs diff=csharp
|