diff --git a/.gitattributes b/.gitattributes
index 0c55e2f594..f140503687 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,6 +7,8 @@
 *.md    text eol=lf
 *.svg   text eol=lf
 *.yml   text eol=lf
+# Don't diff or textually merge source maps
+*.map   binary
 
 bootstrap-theme.css linguist-vendored=false
 bootstrap.css linguist-vendored=false