Question: let's say we backport something (next week) from main to v0.37.x. How do we make sure the changelog for that change also lands on the v0.37x section on branch main?

Question: let's say we backport something (next week) from main to v0.37.x. How do we make sure the changelog for that change also lands on the v0.37x section on branch main?

This is a good question. I've been thinking about this recently, and I would say that we should probably only add changelog entries to PRs in two cases:

1. When we're submitting a PR to main that won't be backported (i.e. it'll land on the new backport branch we create when we start work towards a new version, so we'd want a changelog entry for it by then).
2. When we're submitting a PR to a backport branch (e.g. v0.34.x and v0.37.x). In this case, if the initial PR to main, then we shouldn't include the changelog entry there - only on the backport PRs to the backport branches.

This way, when we cut a new release, it's easy to just copy across all the .changelog entries to main for those releases when we cut them. Otherwise we'll end up with duplicate or incorrect changelog entries that we then need to de-duplicate (this is also a valid approach, but arguably more difficult and time-consuming than doing the work up-front).

I'll see if there's an easy way to codify this in our PR template and contributing guidelines.