On Fri, Sep 30, 2016 at 07:09:15PM +0300, Evgeny Kotkov wrote:
> Hi,
>
> I was thinking about which options should be offered by the tree conflict
> resolver in a common case with a catch-up merge when a file is moved
> away in trunk and edited on the branch. (Limiting the scope to a case
> when
Hi,
I was thinking about which options should be offered by the tree conflict
resolver in a common case with a catch-up merge when a file is moved
away in trunk and edited on the branch. (Limiting the scope to a case
when we can detect the move.)
Currently, the resolver offers the "move local fi
2 matches
Mail list logo
