3 Commits

Include renames

Author	SHA1	Message	Date
akritikos	243a3ce519	🔧 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.	2026-08-28 20:10:29 +03:00
akritikos	6844525107	🔧 Updates .gitattributes to include merge strategy for Directory.Packages.template.props - Upstream always wins	2026-03-20 03:10:00 +02:00
akritikos	cbf8083d31	🔧 Adds .gitattributes to configure merge strategy for Directory.Packages.props	2026-03-20 01:55:34 +02:00