On Wed, Nov 22, 2017 at 11:53:11AM +0100, Julian Foad wrote:
> At the hackathon today we (me, Stefan Hett, Bert, Johan) have been talking
> about how to progress 1.10.
> We think all the features and changes are safe to release and are not going
> to get more testing until we produce a "release candidate". (For example, at
> that point Stefan will be able to justify taking time at his work to test
> the client in production scenarios.)
> * conflict resolution: we understand it is already much better than 1.9;
> low risk if parts of it don't work quite right; designed so that
> improvements can be made in patch releases.
One conflict option that's not done yet is one that merges a textual change
from a path ^/trunk/B to a path ^/branch/A, after a move A -> B on trunk.
I don't consider this a release blocker. We can always add this option in
a patch release.
I would welcome a 1.10.0-RC1 release very much. It feels long overdue.
But I probably won't have time to help with preparations.
Received on 2017-11-22 13:41:22 CET