News for hackers. Stuff that matters.
Re:Git log is not a changelog by RustyRussell on Saturday July 16, 2022 @07:45PM (#32122986)
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.

Re:Git log is not a changelog by plorkyeran on Saturday July 16, 2022 @11:11PM (#32124145)
Setting `CHANGELOG.md merge=union` in .gitattributes mostly eliminates spurious merges conflicts on the changelog.
Re:Git log is not a changelog by jmmv on Sunday July 17, 2022 @12:33AM (#32124482)
Oh wow, thanks for the tip! Had no idea this existed.
Re:Git log is not a changelog by RustyRussell on Sunday July 17, 2022 @07:03AM (#32125811)
Me too! Awesome, thanks!
Re:Git log is not a changelog by cuteboy19 on Sunday July 17, 2022 @05:26PM (#32131487)
Doesn't make sense to automatically do this, some changes can be mutually exclusive
Re:Git log is not a changelog by Ologn on Saturday July 16, 2022 @09:32PM (#32123595)
> 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...