From 3089a6252198789a217c539dc8ba594a98ec1fdc Mon Sep 17 00:00:00 2001
From: Mike Swanson <mike@azcomputerguru.com>
Date: Wed, 22 Jul 2026 09:21:02 -0700
Subject: [PATCH] git: union-merge + text for errorlog.md to stop recurring
 UTF-16/NUL binary conflicts

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitattributes

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