Re: [RFC] Move CHANGES and COMMITTERS out of trunk/branches
From: Julian Foad <julian_at_foad.me.uk>
Date: Mon, 16 Jul 2018 17:49:53 +0100
Julian Foad wrote:
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.
Coincidentally, GitLab recently wrote about their similar bot not identical issue:
-- - JulianReceived on 2018-07-16 18:50:04 CEST
This is an archived mail posted to the Subversion Dev mailing list.