[Wikitech-l] Re: Proposal: new structure for MediaWiki RELEASE-NOTES

2021-07-20 Thread Riccardo Coccioli
On Tue, Jul 20, 2021 at 3:38 AM Petr Pchelko wrote: > *Alternative solutions* > > 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

[Wikitech-l] Re: Proposal: new structure for MediaWiki RELEASE-NOTES

2021-07-20 Thread Antoine Musso
Le 20/07/2021 à 09:48, Riccardo Coccioli a écrit : On Tue, Jul 20, 2021 at 3:38 AM Petr Pchelko > wrote: *Alternative solutions* We could write a custom merge driver for RELEASE-NOTES which always puts ‘ours’ before ’theirs’, but I’m not sure the

[Wikitech-l] Re: Proposal: new structure for MediaWiki RELEASE-NOTES

2021-07-20 Thread Antoine Musso
Le 20/07/2021 à 06:06, Brian Wolff a écrit : > 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. Didnt someone already do that? There used to be a ruby script floating around for that.

[Wikitech-l] Re: Proposal: new structure for MediaWiki RELEASE-NOTES

2021-07-20 Thread Bryan Davis
On Tue, Jul 20, 2021 at 5:22 AM Antoine Musso wrote: > > Le 20/07/2021 à 09:48, Riccardo Coccioli a écrit : > > On Tue, Jul 20, 2021 at 3:38 AM Petr Pchelko wrote: >> >> Alternative solutions >> >> We could write a custom merge driver for RELEASE-NOTES which always puts >> ‘ours’ before