From 46f2c96762f0734f02797bd26c5b55680b8bc090 Mon Sep 17 00:00:00 2001 From: can1357 Date: Thu, 14 May 2026 04:46:58 +0200 Subject: [PATCH] config(config): configured changelog merge behavior in .gitattributes - Updated .gitattributes to merge package changelog files using a union strategy for append-only updates. --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index 16c27cb1a..75e0667b8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -52,3 +52,6 @@ poetry.lock -text *.cmd text eol=crlf *.bat text eol=crlf +# Changelogs are append-mostly; auto-merge by unioning both sides. +packages/*/CHANGELOG.md merge=union +