A common convention we showcase in the Keep a Changelog changelog itself (https://github.com/olivierlacan/keep-a-changelog/blob/604e38...) is to have an [Unreleased] section at the top of the changelog. It rarely conflicts with other branches of a project because it only becomes a version prior to or after a merge into the main branch (trunk/master/etc.).
I'd agree this is an area we need to clarify for version 0.4.0 and forward.
I'd agree this is an area we need to clarify for version 0.4.0 and forward.