4 ms·
We autogenerate our CHANGELOG.md extract from Changelog-[section] our git commit messages (Release Captain massages them if necessary), and have a GH bot which
by RustyRussell 4y ago
We autogenerate our CHANGELOG.md extract from Changelog-[section] our git commit messages (Release Captain massages them if necessary), and have a GH bot which checks that you have a Changelog- note somewhere in your PR commits (can be Changelog-None: ....).
This avoid merge hell on the CHANGELOG.md file.
- Ologn 4y ago> This avoid merge hell on the CHANGELOG.md file. Right, if you don't do something like this you can be in merge hell very quickly...
- plorkyeran 4y agoSetting `CHANGELOG.md merge=union` in .gitattributes mostly eliminates spurious merges conflicts on the changelog.
- jmmv 4y agoOh wow, thanks for the tip! Had no idea this existed.
- RustyRussell 4y agoMe too! Awesome, thanks!
- cuteboy19 4y agoDoesn't make sense to automatically do this, some changes can be mutually exclusive