mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-25 21:19:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

CHANGELOG merge=union

Browse source
This commit is contained in:
Henrik Tjäder 2022-02-15 19:51:54 +01:00
parent 5a186feb16
commit 5f3c5f7f2c
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
CHANGELOG.md merge=union

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added ### Added
- Improve how CHANGELOG.md merges are handled
- If current $stable and master version matches, dev-book redirects to $stable book - 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 - During deploy stage, merge master branch into current stable IFF cargo package version matches
- Rework branch structure, release/vVERSION - Rework branch structure, release/vVERSION