On Tue, Jul 20, 2021 at 3:38 AM Petr Pchelko <ppchelko(a)wikimedia.org> wrote:
We could write a custom merge driver for RELEASE-NOTES which always puts
‘ours’ before ’theirs’,
but I’m not sure the result will justify the investment.
Probably overkill for MediaWiki but I'd like to mention the way that Python
developers (CPython) manages their release notes, in case it might be
The TL;DR is that each change has a unique valid reStructuredText file in a
specific directory and then there is a tool to merge all changes when a
release is made.
The full process from a contributor point of view is described in .
The tool used to both generate the change files and merge them into a
release file is .