Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

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.



Setting `CHANGELOG.md merge=union` in .gitattributes mostly eliminates spurious merges conflicts on the changelog.


Oh wow, thanks for the tip! Had no idea this existed.


Me too! Awesome, thanks!


Doesn't make sense to automatically do this, some changes can be mutually exclusive


> 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...




Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: