While the lack of conflicts with the new snippet based NEWS entries is excellent, I've noticed something I didn't even realise I was previously relying on: when adding a new NEWS entry, I don't have any example entries to look at the way I did when I was editing Misc/NEWS directly. With the move to conflict-free NEWS, we should probably also move https://devguide.python.org/committing/#what-s-new-and-news-entries out of the committers' section and make it a section under https://devguide.python.org/pullrequest/ instead. So what I'm thinking we could do is: - add some concrete examples for a few different kinds of changes (e.g. bug fix, feature addition, significant internal refactoring) - add those examples to the end of the blurb entry template as comments - migrate most of the existing What's New & NEWS content into the PR guide, and change the "Accepting a PR" section to be about deciding whether or not those entries are needed -- Nick Coghlan | ncoghlan@gmail.com | Brisbane, Australia