From 60741e030f3a878b3114d8decb4a6c62b389939c Mon Sep 17 00:00:00 2001
From: unknown <issaclin32@gmail.com>
Date: Thu, 30 Jun 2022 23:00:55 +0800
Subject: [PATCH] (chore): Fix git conflicts with line endings related:
 https://github.com/ScoopInstaller/Extras/issues/7546 related:
 https://github.com/ScoopInstaller/Extras/pull/8285

---
 .editorconfig  | 4 ----
 .gitattributes | 6 ++++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 2a6483b4f..cfd342d57 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,10 +12,6 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{bat,cmd,[Bb][Aa][Tt],[Cc][Mm][Dd]]
-# DOS/Win *requires* BAT/CMD files to have CRLF newlines
-end_of_line = crlf
-
 [[Mm]akefile{,.*}]
 # TAB-style indentation
 indent_style = tab
diff --git a/.gitattributes b/.gitattributes
index 06b5169ac..662a15247 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