Currently the way we do changelog entries causes merge conflicts on almost every PR. This is not ideal.
We could use something like towncrier to avoid this, but that is a lot of extra complexity IMO. It might be best to go back to the release manager (me) adding the entries. That is more works for me though.
A better solution is for people to have descriptive PR titles, as then the "Generate release notes" button in GitHub is more useful. Perhaps we drop the requirement to add a changelog entry and instead add a checklist item for a descriptive PR title, that can be checked at review?
Something else
Currently the way we do changelog entries causes merge conflicts on almost every PR. This is not ideal.
We could use something like towncrier to avoid this, but that is a lot of extra complexity IMO. It might be best to go back to the release manager (me) adding the entries. That is more works for me though.
A better solution is for people to have descriptive PR titles, as then the "Generate release notes" button in GitHub is more useful. Perhaps we drop the requirement to add a changelog entry and instead add a checklist item for a descriptive PR title, that can be checked at review?