Commit 38e65c1

Rashil Gandhi <rashil2000@gmail.com>
2022-07-01 07:59:16
(chore): Fix git conflicts with line endings
Refer https://github.com/ScoopInstaller/Extras/issues/7546
1 parent e888bff
.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
.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