Set git attributes to union changes in the CHANGELOG to reduce merge conflicts (#18474)

cwperks · web-flow · commit 5fa62e1f1821 · 2025-06-09T15:35:09.000-05:00
Signed-off-by: Craig Perkins &lt;cwperx@amazon.com&gt;
diff --git a/.gitattributes b/.gitattributes
@@ -11,3 +11,4 @@
 *.crt binary
 *.p12 binary
 *.txt text=auto
+CHANGELOG.md merge=union
