Commit conventions and releases

[9inpachi]

I think we need to rethink our commit conventions. Our release notes have duplicated commits in them. See https://github.com/HSF/phoenix/releases/tag/v2.7.0

One recommendation I have is to not use the conventions for ordinary commits but only for when we merge a pull request to master. We already have a workflow where each feature is merged through a pull request, so it should work.

CC: @EdwardMoyse

[EdwardMoyse]

This sounds like a good idea to me! I just tried it with the MR I accepted on Wednesday:
ff9f733

[9inpachi]

With our latest release, I found that merge commits are not included in the CHANGELOG. This is problematic. Maybe we should configure our changelog to use PRs for release notes instead.

[9inpachi]

An option for PR-based changelog: https://github.com/lerna/lerna-changelog