From 442e666a0e2685045fd6f1b74d35945d62879752 Mon Sep 17 00:00:00 2001 From: sdolbec Date: Tue, 27 Oct 2026 00:24:32 -0400 Subject: [PATCH] Merge handoff and roadmap logs with the union driver to stop recurring PR conflicts --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index 6707495c4..988b818cb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,6 @@ mseries/patches/dock-taskbar-codexbar.patch whitespace=-blank-at-eol mseries/patches/dock-taskbar-repobar.patch whitespace=-blank-at-eol mseries/patches/dock-taskbar-power-buttons.patch whitespace=-blank-at-eol mseries/patches/dock-running-apps.patch whitespace=-blank-at-eol +# Both files are append/prepend logs edited by every PR; keep both sides instead of conflicting. +mseries/OS9-HANDOFF.md merge=union +mseries/ROADMAP.md merge=union