From 5f3c5f7f2c58da9c9b87c7da6b0507cd08fcb96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Tue, 15 Feb 2022 19:51:54 +0100 Subject: [PATCH] CHANGELOG merge=union --- .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 0000000000..a19ade077d --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union diff --git a/CHANGELOG.md b/CHANGELOG.md index 702d48923d..2bd1829d76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added +- Improve how CHANGELOG.md merges are handled - If current $stable and master version matches, dev-book redirects to $stable book - During deploy stage, merge master branch into current stable IFF cargo package version matches - Rework branch structure, release/vVERSION