Julian Foad wrote on Mon, 16 Jul 2018 17:49 +0100: > Actually the "sync merge" way isn't as automatic as I would like. The > merge always conflicts when there is a new or modified trunk CHANGES > entry for 1.10.x. Maybe --accept=mine-conflict would completely solve > that. Haven't tested that.
We could have CHANGES-1.9, CHANGES-1.10, etc files, and as part of rolling a tarball concatenate them into a single (generated) CHANGES file. Then it would be much easier to merge just 1.9-and-earlier changes to 1.9, etc. (And it would save us writing a parser)
