Re: Tree conflict bug?

[Neels J Hofmeyr <ne...@elego.de>]

Julian Foad wrote:
> Steve, you just committed a change to make "update" carry out a deletion
> while raising a tree conflict. I don't get why that's what we need. Is
> that in keeping with a plan or is it just addressing the current
> situation? I thought the plan was to skip any updating when we raise a
> tree conflict,
[...]

What he said.
I think it's unnecessarily complicating the situation. I also don't
understand how it helps, once the revert is fixed.

~Neels