diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..df9ae8f4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+
+# append/prepend logs: union-merge both machines entries, force text (stop UTF-16/NUL binary conflicts)
+errorlog.md merge=union text eol=lf