🔧 Replaces ineffective merge drivers with EOL normalisation

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.
This commit is contained in:
akritikos committed 2026-08-28 20:10:29 +03:00
1 parent f975b7a41f
commit 243a3ce519
1 file changed
+3 -2
+3 -2
View File
@@ -1,2 +1,3 @@
Directory.Packages.props merge=union * text=auto
Directory.Packages.template.props merge=upstream-wins *.png binary
*.cs diff=csharp