Release process: document (changelog) merging
Originally created by @CyrilBrulebois on #17577 (Redmine)
As agreed among RMs, it would be great to tell the RM of the day how to proceed with merging branches in git; specifically which changelog (dummy) entries to keep in various cases. This would slightly reduce our having to rely on “best judgement”, and/or reduce the need for writing changelog entries intended to convince oneself (see 2c3afc8c).
Related issues
- Related to #17361 (closed)