From 300697098603de42c4b53fca78c997f8dd133051 Mon Sep 17 00:00:00 2001
From: Angela P Wen <angelapwen@github.com>
Date: Wed, 17 Apr 2024 17:07:22 -0700
Subject: [PATCH] Use `merge=union` for `package.json`

---
 .gitattributes | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 73aa45d18..1715cdac4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,10 @@
 lib/*.js linguist-generated=true
 .github/workflows/__* linguist-generated=true
 
-# Reduce incidence of needless merge conflicts on CHANGELOG.md
+# Reduce incidence of needless merge conflicts on CHANGELOG.md and package.json
 # The man page at
 # https://mirrors.edge.kernel.org/pub/software/scm/git/docs/gitattributes.html
 # suggests that this might interleave lines arbitrarily, but empirically
 # it keeps added chunks contiguous
 CHANGELOG.md                merge=union
+package.json                merge=union