diff options
| author |  Henrik Tjäder <henrik@grepit.se>
| 2022-02-15 19:51:54 +0100 |
|---|---|---|
| committer | Henrik Tjäder <henrik@grepit.se>
| 2022-02-15 19:51:54 +0100 |
| commit | 5f3c5f7f2c58da9c9b87c7da6b0507cd08fcb96f (patch) | |
| tree | 1826980142be99cfeb7a2824d00264eccf00a8c0 | |
| parent | 5a186feb16b2800d86a4861084207e720a442ee3 (diff) | |
| download | rtic-5f3c5f7f2c58da9c9b87c7da6b0507cd08fcb96f.tar.gz rtic-5f3c5f7f2c58da9c9b87c7da6b0507cd08fcb96f.tar.zst rtic-5f3c5f7f2c58da9c9b87c7da6b0507cd08fcb96f.zip | |
CHANGELOG merge=union
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | CHANGELOG.md | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..a19ade07 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union diff --git a/CHANGELOG.md b/CHANGELOG.md index 702d4892..2bd1829d 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 |