nit(git): Configures changelog to resolve conflicts with union strate…

…gy (valhalla#2489) * nit(git): Configures changelog to resolve conflicts with union strategy * Fix typo Co-authored-by: Daniel Patterson <[email protected]>
Kashian · Jul 24, 2020 · ce87d0b · ce87d0b
1 parent 9c7b3c6
commit ce87d0b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -19,3 +19,7 @@
 *.bat text eol=crlf
 *.cmd text eol=crlf
 *.ps1 text eol=crlf
+
+# Declare changelog to be union merged, as that's tyically
+# how you want to deal with conflicts in a changelog
+/CHANGELOG.md merge=union