You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@subversion.apache.org by Evgeny Kotkov <ev...@visualsvn.com> on 2016/10/06 20:15:00 UTC

Re: Remote move vs local edit conflict resolution options

Stefan Sperling <st...@elego.de> writes:

> I'd say yes, let's try that.
>
> The delete options are there now because I added them before adding
> a move+merge option became possible.
>
> One concern is that perhaps the move heuristic gets it wrong,
> and there was in fact a deletion. But if that happens we should
> fix the problem where it really is: in the move detection algorithm.
>
> Thanks!

Just for the record, I implemented this behavior in r1762939 [1].

[1] https://svn.apache.org/r1762939


Regards,
Evgeny Kotkov