From 9fc273a6b59e47fab36338777600e731085c617f Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Tue, 10 Mar 2026 21:08:17 +0100 Subject: [PATCH] Use union merge strategy for release notes to avoid conflicts Release notes files are append-only unordered lists where each PR adds one entry. With the default merge strategy, concurrent PRs that both append under the same heading (e.g. ### Fixed) produce merge conflicts even though order doesn't matter. The union merge driver keeps both sides, eliminating these conflicts. This is consistent with the existing use of merge=union for .sln and project files in this repo. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitattributes b/.gitattributes index 22ea220d8ff..4b531f310e2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,10 @@ *.fsproj text merge=union *.dbproj text merge=union +# Release notes are append-only unordered lists; union merge avoids conflicts +# when multiple PRs each add an entry under the same heading. +docs/release-notes/**/*.md text merge=union + # Standard to msysgit *.doc diff=astextplain *.DOC diff=astextplain