changelog.yml merge strategy

[jayvdb]

The problem with a yaml changelog is that it always has merge conflicts the order of merges usually differs from the order of PRs created.

If the changes are added at the bottom, the "union" merge driver can be specified in .gitattributes.

As the changes are added at the top, we may try specifying using the union merge driver for this file, or a custom mergetool or custom merge driver , but these often require later git and also sometimes need each developer to add an entry to their ~/.git/config . However we have a small team and we can use/build tools to help manage that.