From df10303a0527825564a040f42e60ae7db617270d Mon Sep 17 00:00:00 2001
From: Rashil Gandhi <46838874+rashil2000@users.noreply.github.com>
Date: Tue, 21 Jun 2022 12:43:35 +0530
Subject: [PATCH] (chore): Fix git conflicts with line endings (#3693)

* Update .editorconfig

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

diff --git a/.editorconfig b/.editorconfig
index 3f9097a912dc8..cfd342d5790f9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,10 +12,6 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{[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 06b5169ac250b..662a152476d7b 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