diff --git a/.gitattributes b/.gitattributes index f811f6ae6a..ddb600fab2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ # are changed when only line endings change. src/generated/**/.cache/cache text eol=lf src/generated/**/*.json text eol=lf +CHANGELOG.md merge=union \ No newline at end of file