From 0ebc79b2a90ad03b8da9b7a47d41acfbde857e37 Mon Sep 17 00:00:00 2001
From: Ivor Bosloper <ivorbosloper@gmail.com>
Date: Thu, 18 Jun 2026 11:51:03 +0200
Subject: [PATCH] Automatically combine concurrent changes to CHANGELOG.md in
 two open PRs

---
 .gitattributes | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..cd52225
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+# Combine concurrent changes to CHANGELOG.md instead of conflicting. When two PRs both append
+# entries under "## [Unreleased]", git's built-in "union" driver keeps both
+# sets of added lines rather than reporting a merge conflict.
+CHANGELOG.md merge=union