Solving merge conflicts in whatsnew once and for all
[towncrier](https://github.com/hawkowl/towncrier), as used by `pipenv`,

```
towncrier is a utility to produce useful, summarised news files for your project. 
Rather than reading the Git history as some newer tools to produce it, or 
having one single file which developers all write to, towncrier reads 
“news fragments” which contain information useful to end users.
```

if the package itself is not option, you may still want to adpot its approach of assembling  issuenum named fragment files together.  For an example, see
https://github.com/pypa/pipenv/tree/master/news


