From 243a3ce519a4786636b085d95c10bf3a8a2e7498 Mon Sep 17 00:00:00 2001 From: Alexandros Kritikos Date: Fri, 28 Aug 2026 20:10:29 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Replaces=20ineffective=20merge?= =?UTF-8?q?=20drivers=20with=20EOL=20normalisation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- .gitattributes | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 266b038..3c10e00 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ -Directory.Packages.props merge=union -Directory.Packages.template.props merge=upstream-wins +* text=auto +*.png binary +*.cs diff=csharp