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.
I wish that you could specify merge behaviour on a file-by-file basis for something like Git, even as simple as “don’t worry about the text before when adding lines, just anchor it to the text after” which would equate to “append to section” in the earlier outlined case.
Generally people edit changelogs after pull requests have been merged or as part of the pull requests themselves. It's far easier to figure out merge conflicts if and when other versions appended to the changelog simultaneously because all changelog entries are dated (or at least they should be) or at least versioned and contain plain text.
That said I agree that we should probably spend some time detailing common processes for editing and appending to a changelog in situations with concurrent branches being developed.
This is only a problem if you're handling multiple PRs simultaneously so your project has to reach a certain level of use before you'll see it.