From fa266d39e2e53dcad6740a019a89ab4d3b56c596 Mon Sep 17 00:00:00 2001 From: Patrick Cherry Date: Tue, 17 Jan 2023 11:59:03 +0000 Subject: [PATCH] Add merge=union for the CHANGELOG file (#339) This should reduce the amount of PR conflict --- .gitattributes | 1 + CHANGELOG.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..a19ade077 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union diff --git a/CHANGELOG.md b/CHANGELOG.md index 392e7ff55..55db31e5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Change port number to fix 'no consent token' error (#326) - Long file names truncated rather than scrolling in left hand file pane (#316, #337) - Tab scrollbars only appear when necessary (#331) +- Added merge=union gitattribute for this file (#339) ### Fixed - Make sure button text is always centered (#328)