diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-02-15 18:56:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-15 18:56:47 +0000 |
| commit | 886183066d3bb8c359aaf6442e9201bab8cd4694 (patch) | |
| tree | 8bc58c86f13054e80bc557072acb38cba066684f | |
| parent | 9fb51f2cdde9bf8b5e856ad62162d6b8ac814faf (diff) | |
| parent | 5f3c5f7f2c58da9c9b87c7da6b0507cd08fcb96f (diff) | |
Merge #614
614: CHANGELOG merge=union r=perlindgren a=AfoHT
Co-authored-by: Henrik Tjäder <henrik@grepit.se>
| -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 0000000..a19ade0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union 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 |