diff --git a/.gitattributes b/.gitattributes index 590ac71c0..561741e37 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ +* text=auto CHANGELOG.md merge=union # Reviewing the lockfile contents is an important step in verifying that