On Thu, Aug 24, 2017 at 01:44:48PM +0200, Stefan Sperling wrote: > I see the following options going forward:
> 2) Try to make the resolver handle the case where copyfrom does not point > back into the same branch. (How?) I have implemented option 2) in r1806831. It seems to work, but additional testing would be appreciated. While doing random manual tests I saw some cases where the resolver correctly identifies the move but then offered no useful resolution option. I have not yet investigated why this is happening. I suspect we are simply lacking conflict option implementations for these cases.
