On Sat, Sep 08, 2018 at 05:38:44PM +0100, Julian Foad wrote: > I plan to make the 1.11.x branch in the next few days if I'm satisfied with > the items below.
The conflict resolver does not support ambiguous moves yet for 'local missing' conflicts. I hope to get to that soon. Patches for this could be backported from trunk so don't let this block you from creating a branch. It's just something I would really like to see included in the 1.11 release :)
