Issue #3320 -- was: Re: Tree conflicts - What's To Do?

Neels J. Hofmeyr wrote:
> Making comments inline...
>
> Julian Foad wrote:
>> We all want to know what's left to do for tree conflicts. Here's the
>> best list I can make today. There are some obviously-blocking issues,
>> and there's lots more stuff we'd like to do but won't for 1.6, and there
>> are questions of usability.
>>
>> =====
>> #3320: Commit not blocked by tree conflict
>
> This is very severe. Will try to look at this one next.

Fixed in r34247. A "remains in conflict" error is now reported when
recursing onto tree-conflict victims that have no entry.

When a victim that has no entry is an explicit target, the error "is not
under version control" is still issued. Utterly low priority.

~Neels