aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorHenrik Tjäder <henrik@grepit.se>2022-02-15 19:51:54 +0100
committerHenrik Tjäder <henrik@grepit.se>2022-02-15 19:51:54 +0100
commit5f3c5f7f2c58da9c9b87c7da6b0507cd08fcb96f (patch)
tree1826980142be99cfeb7a2824d00264eccf00a8c0 /CHANGELOG.md
parent5a186feb16b2800d86a4861084207e720a442ee3 (diff)
CHANGELOG merge=union
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 702d489..2bd1829 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