diff --git a/.gitattributes b/.gitattributes index 252299c5609a..d836e4264a62 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,3 +4,4 @@ *.key binary *.jar binary *.ttf binary +release-notes-* merge=union