diff --git a/.editorconfig b/.editorconfig
index a25dbdfc..13dcd5e0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,3 +2,10 @@
 insert_final_newline = true
 indent_style = tab
 indent_size = 4
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.txt]
+insert_final_newline = false
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..a0a624af
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+# merger hooks, run tools/hooks/install.bat or install.sh to set up
+*.dmm merge=dmm
+*.dmi merge=dmi
+
+# force changelog merging to use union
+html/changelog.html merge=union
+
+# force all files to be LF 
+* text=auto