diff --git a/.gitattributes b/.gitattributes
index 23282ab..08c557c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,10 @@
+# Line ending normalization - prevents Windows/Linux conflicts
+* text=auto eol=lf
+
+# Windows-only files should use CRLF
+*.bat text eol=crlf
+*.cmd text eol=crlf
+
 Assets/**/*.png filter=lfs diff=lfs merge=lfs -text
 **/*.png filter=lfs diff=lfs merge=lfs -text
 scenes/entrance/entrance-wall.png filter=lfs diff=lfs merge=lfs -text