From 38e65c144b55ed59a0d48eb5a362ed93146ef613 Mon Sep 17 00:00:00 2001
From: Rashil Gandhi <rashil2000@gmail.com>
Date: Fri, 1 Jul 2022 10:29:16 +0530
Subject: [PATCH] (chore): Fix git conflicts with line endings

Refer https://github.com/ScoopInstaller/Extras/issues/7546
---
 .editorconfig  | 4 ----
 .gitattributes | 6 ++++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index b624966..09a7419 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,7 +14,3 @@ trim_trailing_whitespace = true
 
 [*.{yml,yaml}]
 indent_size = 2
-
-[*.{[Bb][Aa][Tt],[Cc][Mm][Dd]}]
-# DOS/Win *requires* BAT/CMD files to have CRLF newlines
-end_of_line = crlf
diff --git a/.gitattributes b/.gitattributes
index 06b5169..662a152 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,4 @@
-# retain windows line-endings in case checked out on mac or linux
-* text eol=crlf
+# Since Scoop is a Windows-only tool, we can safely use CRLF line endings for all text files.
+# If Git decides that the content is text, its line endings will be normalized to CRLF in the working tree on checkout.
+# In the Git index/repository the files will always be stored with LF line endings. This is fine.
+* text=auto eol=crlf